diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/SettingsActivity.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index e413090a4..337b38f35 100755 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -428,12 +428,14 @@ public class SettingsActivity extends PreferenceActivity { } CharSequence[] entries = mSettingsManager.getEntries(SettingsManager.KEY_SCENE_MODE); - List<CharSequence> list = Arrays.asList(entries); - if (mDeveloperMenuEnabled && list != null && !list.contains("HDR")){ - Preference p = findPreference("pref_camera2_hdr_key"); - if (p != null){ - PreferenceGroup developer = (PreferenceGroup)findPreference("developer"); - developer.removePreference(p); + if (entries != null) { + List<CharSequence> list = Arrays.asList(entries); + if (mDeveloperMenuEnabled && list != null && !list.contains("HDR")){ + Preference p = findPreference("pref_camera2_hdr_key"); + if (p != null){ + PreferenceGroup developer = (PreferenceGroup)findPreference("developer"); + developer.removePreference(p); + } } } |