TestingCamera, TestingCamera2: Add runtime permission checking

The permission requests are placed largely where it is easiest to do,
though some effort is made to not ask for a permission before it's actually
needed.

Change-Id: Ia484d6741da6a6c5ab812ecf2bbadc5d9ce81572

1 files changed, 2 insertions, 3 deletions

diff --git a/apps/TestingCamera2/src/com/android/testingcamera2/CameraControlPane.java b/apps/TestingCamera2/src/com/android/testingcamera2/CameraControlPane.java
index 00f721e..b220328 100644
--- a/apps/TestingCamera2/src/com/android/testingcamera2/CameraControlPane.java
+++ b/apps/TestingCamera2/src/com/android/testingcamera2/CameraControlPane.java
@@ -376,8 +376,7 @@ public class CameraControlPane extends ControlPane {
                     if (isChecked) {
                         // Open camera
                         mCurrentCamera = null;
-                        boolean success = mCameraOps.openCamera(mCurrentCameraId, mCameraListener);
-                        buttonView.setChecked(success);
+                        mCameraOps.openCamera(mCurrentCameraId, mCameraListener);
                     } else {
                         // Close camera
                         closeCurrentCamera();
@@ -520,6 +519,7 @@ public class CameraControlPane extends ControlPane {
         @Override
         public void onClosed(CameraDevice camera) {
             // Don't change state on close, tracked by callers of close()
+            mOpenButton.setChecked(false);
         }
 
         @Override
@@ -558,7 +558,6 @@ public class CameraControlPane extends ControlPane {
             mCurrentCamera.close();
             mCurrentCamera = null;
             setCameraState(CameraState.CLOSED);
-            mOpenButton.setChecked(false);
         }
     }