diff options
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/PhotoModule.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 884fe142e..a784c34fb 100644..100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -16,12 +16,14 @@ package com.android.camera; +import android.Manifest; import android.annotation.TargetApi; import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences.Editor; +import android.content.pm.PackageManager; import android.content.res.Configuration; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -645,7 +647,12 @@ public class PhotoModule /* Enable the location at the begining, always. If the user denies the permission, it will be disabled right away due to exception */ - enableRecordingLocation(true); + boolean enableRecordingLocation = false; + if (mActivity.checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) + == PackageManager.PERMISSION_GRANTED) { + enableRecordingLocation = true; + } + enableRecordingLocation(enableRecordingLocation); } @Override @@ -2362,7 +2369,7 @@ public class PhotoModule String zsl = mPreferences.getString(CameraSettings.KEY_ZSL, mActivity.getString(R.string.pref_camera_zsl_default)); mUI.overrideSettings(CameraSettings.KEY_ZSL, zsl); - mUI.startCountDown(seconds, isShutterSoundOn()); + mUI.startCountDown(seconds, playSound); } else { mSnapshotOnIdle = false; initiateSnap(); |