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

Merge "Camera: Reconnect after camera service crashes" into mnc-dev

Browse Source
This commit is contained in:
Chien-Yu Chen
2015-07-14 20:48:54 +00:00
committed by Android (Google) Code Review
parent 5cf30c608f 0f69b4655f
commit 6eec00ecf4
1 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -723,6 +723,8 @@ public final class CameraManager {
private static final String TAG = "CameraManagerGlobal";
private final boolean DEBUG = false;
private final int CAMERA_SERVICE_RECONNECT_DELAY_MS = 1000;
// Singleton instance
private static final CameraManagerGlobal gCameraManager =
new CameraManagerGlobal();
@@ -1157,6 +1159,45 @@ public final class CameraManager {
}
}
/**
* Try to connect to camera service after some delay if any client registered camera
* availability callback or torch status callback.
*/
private void scheduleCameraServiceReconnectionLocked() {
final Handler handler;
if (mCallbackMap.size() > 0) {
handler = mCallbackMap.valueAt(0);
} else if (mTorchCallbackMap.size() > 0) {
handler = mTorchCallbackMap.valueAt(0);
} else {
// Not necessary to reconnect camera service if no client registers a callback.
return;
}
if (DEBUG) {
Log.v(TAG, "Reconnecting Camera Service in " + CAMERA_SERVICE_RECONNECT_DELAY_MS +
" ms");
}
handler.postDelayed(
new Runnable() {
@Override
public void run() {
ICameraService cameraService = getCameraService();
if (cameraService == null) {
synchronized(mLock) {
if (DEBUG) {
Log.v(TAG, "Reconnecting Camera Service failed.");
}
scheduleCameraServiceReconnectionLocked();
}
}
}
},
CAMERA_SERVICE_RECONNECT_DELAY_MS);
}
/**
* Listener for camera service death.
*
@@ -1171,21 +1212,19 @@ public final class CameraManager {
mCameraService = null;
// Tell listeners that the cameras and torch modes are _available_, because any
// existing clients will have gotten disconnected. This is optimistic under the
// assumption that the service will be back shortly.
//
// Without this, a camera service crash while a camera is open will never signal
// to listeners that previously in-use cameras are now available.
// Tell listeners that the cameras and torch modes are unavailable and schedule a
// reconnection to camera service. When camera service is reconnected, the camera
// and torch statuses will be updated.
for (int i = 0; i < mDeviceStatus.size(); i++) {
String cameraId = mDeviceStatus.keyAt(i);
onStatusChangedLocked(STATUS_PRESENT, cameraId);
onStatusChangedLocked(STATUS_NOT_PRESENT, cameraId);
}
for (int i = 0; i < mTorchStatus.size(); i++) {
String cameraId = mTorchStatus.keyAt(i);
onTorchStatusChangedLocked(TORCH_STATUS_AVAILABLE_OFF, cameraId);
onTorchStatusChangedLocked(TORCH_STATUS_NOT_AVAILABLE, cameraId);
}
scheduleCameraServiceReconnectionLocked();
}
}