diff options
author | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-08-21 23:11:36 +0300 |
---|---|---|
committer | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-08-21 23:11:36 +0300 |
commit | 7ed0766cd48447711205713976aad4ddbb443739 (patch) | |
tree | 085ddbc2c258a9d28ed53dcdcaf4afe45a375758 /src/com/android | |
parent | 46a8831be1f4fde221e790308a555f116d0dbecc (diff) | |
download | android_packages_apps_Snap-7ed0766cd48447711205713976aad4ddbb443739.tar.gz android_packages_apps_Snap-7ed0766cd48447711205713976aad4ddbb443739.tar.bz2 android_packages_apps_Snap-7ed0766cd48447711205713976aad4ddbb443739.zip |
Snap: Fix bad merge of "Fixed M permission issue"
Change-Id: I493cac1abc38323a4f91506898d25b4f9aea1c79
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 0e0978d83..288cdc0eb 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1812,14 +1812,14 @@ public class CameraActivity extends Activity mWakeLock.release(); Log.d(TAG, "wake lock release"); } - if (mSecureCamera) { - unregisterReceiver(mScreenOffReceiver); - } - getContentResolver().unregisterContentObserver(mLocalImagesObserver); - getContentResolver().unregisterContentObserver(mLocalVideosObserver); - unregisterReceiver(mSDcardMountedReceiver); - if (mCursor != null) { + if (mSecureCamera) { + unregisterReceiver(mScreenOffReceiver); + } + getContentResolver().unregisterContentObserver(mLocalImagesObserver); + getContentResolver().unregisterContentObserver(mLocalVideosObserver); + unregisterReceiver(mSDcardMountedReceiver); + mCursor.close(); mCursor=null; } |