diff options
| author | jinwu <jinwu@codeaurora.org> | 2018-09-21 18:29:01 +0800 |
|---|---|---|
| committer | jinwu <jinwu@codeaurora.org> | 2018-09-21 18:29:01 +0800 |
| commit | d0af7db21c4384bef6b474448238e2831cd5aed6 (patch) | |
| tree | e12c54f4f4be751d0331e6f629dfc6a09200b529 /src | |
| parent | a26301351c28e820f6c2346ebd07265cfed14c8b (diff) | |
| download | android_packages_apps_Snap-d0af7db21c4384bef6b474448238e2831cd5aed6.tar.gz android_packages_apps_Snap-d0af7db21c4384bef6b474448238e2831cd5aed6.tar.bz2 android_packages_apps_Snap-d0af7db21c4384bef6b474448238e2831cd5aed6.zip | |
SnapdragonCamera: Fix NullPointerException for getEntries
Fix NullPointerPointerException for getEntries KEY_SCENE_MODE.
CRs-Fixed: 2312031
Change-Id: I11845c3d805979ba55ceb5421956da30c2e4eab5
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); + } } } |