diff options
| author | Simmi Pateriya <simmip@localhost> | 2018-09-24 22:00:35 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-24 22:00:35 -0700 |
| commit | cbc0272fb68ce236479508e5e9929f878ff2a6ca (patch) | |
| tree | 622b18fca76918a9e0bdff00ebfb112d786702e5 /src | |
| parent | 4fc327fc833f29c051f02e73fd22294196c30af6 (diff) | |
| parent | d0af7db21c4384bef6b474448238e2831cd5aed6 (diff) | |
| download | android_packages_apps_Snap-cbc0272fb68ce236479508e5e9929f878ff2a6ca.tar.gz android_packages_apps_Snap-cbc0272fb68ce236479508e5e9929f878ff2a6ca.tar.bz2 android_packages_apps_Snap-cbc0272fb68ce236479508e5e9929f878ff2a6ca.zip | |
Merge "SnapdragonCamera: Fix NullPointerException for getEntries" into camera-SnapdragonCamera.lnx.2.0
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 d180d6c27..4a8e28d8f 100755 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -613,12 +613,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); + } } } |