diff options
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 77438881c..36505b132 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1779,7 +1779,9 @@ public class CameraActivity extends Activity protected void initPowerShutter(ComboPreferences prefs) { String val = prefs.getString(CameraSettings.KEY_POWER_SHUTTER, getResources().getString(R.string.pref_camera_power_shutter_default)); - mPowerShutter = val.equals(CameraSettings.VALUE_ON); + if (!CameraUtil.hasCameraKey()) { + mPowerShutter = val.equals(CameraSettings.VALUE_ON); + } if (mPowerShutter /*TODO: && mShowCameraAppView*/) { getWindow().addPrivateFlags( WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_POWER_KEY); |