SnapdragonCamera:Fix Camera force close when touching Restore defaults.

Before restore settings,if current is not developer mode,the developer
preferenceGroup has been removed when enter camera by default.
So duplicate remove it will cause crash.

When remove developer preferenceGroup,need to check if it's null,if it's
null,indicates that it has been removed, no need to remove it again.

Change-Id: I6185011c5183ff0821d4925d9b40c077d3e354d2
CRs-Fixed: 1115107

1 files changed, 8 insertions, 3 deletions

diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java
index 0444fc80d..00f42daa4 100644
--- a/src/com/android/camera/SettingsActivity.java
+++ b/src/com/android/camera/SettingsActivity.java
@@ -171,9 +171,14 @@ public class SettingsActivity extends PreferenceActivity {
             set.add(SettingsManager.KEY_MONO_ONLY);
             set.add(SettingsManager.KEY_CLEARSIGHT);
 
-            PreferenceScreen parent = getPreferenceScreen();
-            PreferenceGroup developer = (PreferenceGroup)findPreference("developer");
-            parent.removePreference(developer);
+            PreferenceGroup developer = (PreferenceGroup) findPreference("developer");
+            //Before restore settings,if current is not developer mode,the developer
+            // preferenceGroup has been removed when enter camera by default .So duplicate remove
+            // it will cause crash.
+            if (developer != null) {
+                PreferenceScreen parent = getPreferenceScreen();
+                parent.removePreference(developer);
+            }
         }
 
         CharSequence[] entries = mSettingsManager.getEntries(SettingsManager.KEY_SCENE_MODE);