Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera2: Reconnect camera service for listeners" into nyc-dev

Browse Source 
am: 9d78716

* commit '9d78716131e40157ea449034847ee14536567aa1':
  Camera2: Reconnect camera service for listeners
This commit is contained in:
Chien-Yu Chen
2016-03-17 23:45:46 +00:00
committed by android-build-merger
parent 706928df5d 9d78716131
commit 3699ef1890
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/hardware/camera2/CameraManager.java
View File

@@ -1099,6 +1099,11 @@ public final class CameraManager {
if (oldHandler == null) { if (oldHandler == null) {
updateCallbackLocked(callback, handler); updateCallbackLocked(callback, handler);
} }
// If not connected to camera service, schedule a reconnect to camera service.
if (mCameraService == null) {
scheduleCameraServiceReconnectionLocked();
}
} }
} }
@@ -1123,6 +1128,11 @@ public final class CameraManager {
if (oldHandler == null) { if (oldHandler == null) {
updateTorchCallbackLocked(callback, handler); updateTorchCallbackLocked(callback, handler);
} }
// If not connected to camera service, schedule a reconnect to camera service.
if (mCameraService == null) {
scheduleCameraServiceReconnectionLocked();
}
} }
} }