Refactor PhotoSphere and Refocus: new camera open

This is part of the Denali refactor work. Now PhotoSphere and Refocus both uses
the new camera start up process so the camera is not released between modules.

See http://ag/392043/

Change-Id: I6ae9b111ba1fda33912159e0967f3a12d02937ba

diff --git a/src/com/android/camera/app/CameraController.java b/src/com/android/camera/app/CameraController.java
index acd2cce..1bb0a29 100644 (file)
--- a/src/com/android/camera/app/CameraController.java
+++ b/src/com/android/camera/app/CameraController.java
@@ -68,7 +68,7 @@ public class CameraController implements CameraManager.CameraOpenCallback, Camer
         int firstFront = -1;
         int firstBack = -1;
         // Get the first (smallest) back and first front camera id.
-        for (int i = 0; i < mNumberOfCameras; i++) {
+        for (int i = mNumberOfCameras - 1; i >= 0; i--) {
             if (mCameraInfos[i].facing == Camera.CameraInfo.CAMERA_FACING_BACK) {
                 firstBack = i;
             } else {

diff --git a/src/com/android/camera/app/CameraProvider.java b/src/com/android/camera/app/CameraProvider.java
index 7c81557..5733e97 100644 (file)
--- a/src/com/android/camera/app/CameraProvider.java
+++ b/src/com/android/camera/app/CameraProvider.java
@@ -51,12 +51,12 @@ public interface CameraProvider {
     public int getNumberOfCameras();
 
     /**
-     * Returns the lowest ID of the back camera.
+     * @returns The lowest ID of the back camera or -1 if not available.
      */
     public int getFirstBackCameraId();
 
     /**
-     * Returns the lowest ID of the front camera.
+     * @return The lowest ID of the front camera or -1 if not available.
      */
     public int getFirstFrontCameraId();
 }

diff --git a/src/com/android/camera/module/ModulesInfo.java b/src/com/android/camera/module/ModulesInfo.java
index c42865b..a0a7f44 100644 (file)
--- a/src/com/android/camera/module/ModulesInfo.java
+++ b/src/com/android/camera/module/ModulesInfo.java
@@ -126,7 +126,7 @@ public class ModulesInfo {
 
             @Override
             public boolean requestAppForCamera() {
-                return false;
+                return true;
             }
 
             @Override
@@ -146,7 +146,7 @@ public class ModulesInfo {
 
             @Override
             public boolean requestAppForCamera() {
-                return false;
+                return true;
             }
 
             @Override