SnapdragonCamera:Fix crash when settingsManager is null

After change the permissions of SnapdragonCamera, SettingsManager
will be null, and caused exception in SettingsActivity, when
SettingsManager is null, SettingsActivity will be finished.

Change-Id: I6dcf541feae0265e0a5479b246f74880fc03433c
CRs-Fixed: 1084376

1 files changed, 4 insertions, 0 deletions

diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java
index 32c6b5cad..bff4f91d2 100644
--- a/src/com/android/camera/SettingsActivity.java
+++ b/src/com/android/camera/SettingsActivity.java
@@ -87,6 +87,10 @@ public class SettingsActivity extends PreferenceActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mSettingsManager = SettingsManager.getInstance();
+        if (mSettingsManager == null) {
+            finish();
+            return;
+        }
         addPreferencesFromResource(R.xml.setting_menu_preferences);
 
         mSharedPreferences = getPreferenceManager().getSharedPreferences();