From d0af7db21c4384bef6b474448238e2831cd5aed6 Mon Sep 17 00:00:00 2001 From: jinwu Date: Fri, 21 Sep 2018 18:29:01 +0800 Subject: SnapdragonCamera: Fix NullPointerException for getEntries Fix NullPointerPointerException for getEntries KEY_SCENE_MODE. CRs-Fixed: 2312031 Change-Id: I11845c3d805979ba55ceb5421956da30c2e4eab5 --- src/com/android/camera/SettingsActivity.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src') 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 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 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); + } } } -- cgit v1.2.3