commit 29a009c974f153f72cd5e28851a8cb85a691e215
author Alan Newberger <alann@google.com> Fri Sep 05 12:47:42 2014 -0700
committer Alan Newberger <alann@google.com> Fri Sep 05 12:47:42 2014 -0700
tree 949ff1dd72d55a467c10060a35c24aa12072569a
parent dc0369f37b07adb4355113540af3c1f7c82a404e

Add additional lifecycle logging to Camera

To assist in diagnosing startup issues, added some logging.

Bug: 17397753
Change-Id: Icc47ec278c0b68c8834bfb52554425ff7f371ea0

src/com/android/camera/CameraActivity.java

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index e6f81cd..3f1fd62 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -473,7 +473,9 @@
 
     @Override
     public void onCameraOpened(CameraAgent.CameraProxy camera) {
+        Log.v(TAG, "onCameraOpened");
         if (mPaused) {
+            Log.v(TAG, "received onCameraOpened but activity is paused");
             return;
         }
         /**
@@ -506,7 +508,10 @@
         if (mCurrentModule != null) {
             resetExposureCompensationToDefault(camera);
             mCurrentModule.onCameraAvailable(camera);
+        } else {
+            Log.v(TAG, "mCurrentModule null, not invoking onCameraAvailable");
         }
+        Log.v(TAG, "invoking onChangeCamera");
         mCameraAppUI.onChangeCamera();
     }
 

src/com/android/camera/PhotoModule.java

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 63265e0..53316a6 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -679,6 +679,7 @@
      * device, using {@link GservicesHelper} to choose between API-1 and API-2.
      */
     private void requestCameraOpen() {
+        Log.v(TAG, "requestCameraOpen");
         mActivity.getCameraProvider().requestCamera(mCameraId,
                 GservicesHelper.useCamera2ApiThroughPortabilityLayer(mActivity));
     }
@@ -1354,6 +1355,7 @@
 
     @Override
     public void onCameraAvailable(CameraProxy cameraProxy) {
+        Log.v(TAG, "onCameraAvailable");
         if (mPaused) {
             return;
         }

src/com/android/camera/app/CameraController.java

diff --git a/src/com/android/camera/app/CameraController.java b/src/com/android/camera/app/CameraController.java
index c83b67f..64474ab 100644
--- a/src/com/android/camera/app/CameraController.java
+++ b/src/com/android/camera/app/CameraController.java
@@ -17,15 +17,14 @@
 package com.android.camera.app;
 
 import android.content.Context;
-import android.hardware.Camera;
 import android.os.Handler;
 
 import com.android.camera.CameraDisabledException;
 import com.android.camera.debug.Log;
 import com.android.camera.util.CameraUtil;
-import com.android.ex.camera2.portability.CameraDeviceInfo;
 import com.android.ex.camera2.portability.CameraAgent;
 import com.android.ex.camera2.portability.CameraAgent.CameraExceptionCallback;
+import com.android.ex.camera2.portability.CameraDeviceInfo;
 
 /**
  * A class which implements {@link com.android.camera.app.CameraProvider} used
@@ -206,6 +205,7 @@
 
     @Override
     public void requestCamera(int id, boolean useNewApi) {
+        Log.v(TAG, "requestCamera");
         // Based on
         // (mRequestingCameraId == id, mRequestingCameraId == EMPTY_REQUEST),
         // we have (T, T), (T, F), (F, T), (F, F).
@@ -230,6 +230,7 @@
             // No camera yet.
             checkAndOpenCamera(mContext, cameraManager, id, mCallbackHandler, this);
         } else if (mCameraProxy.getCameraId() != id || mUsingNewApi != useNewApi) {
+            Log.v(TAG, "different camera already opened, closing then reopening");
             // Already has camera opened, and is switching cameras and/or APIs.
             if (mUsingNewApi) {
                 mCameraAgentNg.closeCamera(mCameraProxy, true);
@@ -296,6 +297,7 @@
 
     private static void checkAndOpenCamera(Context context, CameraAgent cameraManager,
             final int cameraId, Handler handler, final CameraAgent.CameraOpenCallback cb) {
+        Log.v(TAG, "checkAndOpenCamera");
         try {
             CameraUtil.throwIfCameraDisabled(context);
             cameraManager.openCamera(handler, cameraId, cb);