From 5ac3c216d23cbe070923fac4ee3604c445bf6dc7 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Wed, 23 Oct 2019 20:47:31 +0200 Subject: Fix NPE when removing RAW setting * That preference is already gone when developer options are disabled. Change-Id: I040d153561cce691e8e5689bb810585071cb5836 --- src/com/android/camera/SettingsActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index 6cdaa5501..cdfb9d625 100755 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -713,7 +713,7 @@ public class SettingsActivity extends PreferenceActivity { int cameraId = mSettingsManager.getCurrentCameraId(); Size[] rawSize = mSettingsManager.getSupportedOutputSize(cameraId, ImageFormat.RAW10); - if (rawSize == null) { + if (mDeveloperMenuEnabled && rawSize == null) { Preference p = findPreference(SettingsManager.KEY_SAVERAW); p.setEnabled(false); } -- cgit v1.2.3