From 7ed0766cd48447711205713976aad4ddbb443739 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Sun, 21 Aug 2016 23:11:36 +0300
Subject: Snap: Fix bad merge of "Fixed M permission issue"

Change-Id: I493cac1abc38323a4f91506898d25b4f9aea1c79
---
 src/com/android/camera/CameraActivity.java | 14 +++++++-------
 1 file 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;
         }
-- 
cgit v1.2.3