OSDN Git Service

am b0177ff2: am 46910bdc: Camera2/3: Fix deadlock when starting recording before...
authorEino-Ville Talvala <etalvala@google.com>
Fri, 19 Jul 2013 23:02:11 +0000 (16:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Jul 2013 23:02:11 +0000 (16:02 -0700)
* commit 'b0177ff25e3e620be6ebe1e2c3f645b2f05dd57e':
  Camera2/3: Fix deadlock when starting recording before preview.

1  2 
services/camera/libcameraservice/Camera3Device.cpp

@@@ -1363,26 -1299,11 +1307,12 @@@ void Camera3Device::processCaptureResul
          mResultSignal.signal();
      }
  
-     if (result->result != NULL && listener != NULL) {
-         if (new3aState.aeState != cur3aState.aeState) {
-             ALOGVV("%s: AE state changed from 0x%x to 0x%x",
-                     __FUNCTION__, cur3aState.aeState, new3aState.aeState);
-             listener->notifyAutoExposure(new3aState.aeState, aeTriggerId);
-         }
-         if (new3aState.afState != cur3aState.afState) {
-             ALOGVV("%s: AF state changed from 0x%x to 0x%x",
-                     __FUNCTION__, cur3aState.afState, new3aState.afState);
-             listener->notifyAutoFocus(new3aState.afState, afTriggerId);
-         }
-         if (new3aState.awbState != cur3aState.awbState) {
-             listener->notifyAutoWhitebalance(new3aState.awbState, aeTriggerId);
-         }
-     }
  }
  
  void Camera3Device::notify(const camera3_notify_msg *msg) {
 +    ATRACE_CALL();
      NotificationListener *listener;
      {
          Mutex::Autolock l(mOutputLock);