Merge "Camera: Improve error handling of device state listeners" into udc-dev (cbfa540d) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/CameraCharacteristics.java

+13 −9

Original line number	Diff line number	Diff line
		@@ -212,14 +212,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		@GuardedBy("mLock")
		private boolean mFoldedDeviceState;

		private final CameraManager.DeviceStateListener mFoldStateListener =
		new CameraManager.DeviceStateListener() {
		@Override
		public final void onDeviceStateChanged(boolean folded) {
		synchronized (mLock) {
		mFoldedDeviceState = folded;
		}
		}};
		private CameraManager.DeviceStateListener mFoldStateListener;

		private static final String TAG = "CameraCharacteristics";

		@@ -245,7 +238,18 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		/**
		* Return the device state listener for this Camera characteristics instance
		*/
		CameraManager.DeviceStateListener getDeviceStateListener() { return mFoldStateListener; }
		CameraManager.DeviceStateListener getDeviceStateListener() {
		if (mFoldStateListener == null) {
		mFoldStateListener = new CameraManager.DeviceStateListener() {
		@Override
		public final void onDeviceStateChanged(boolean folded) {
		synchronized (mLock) {
		mFoldedDeviceState = folded;
		}
		}};
		}
		return mFoldStateListener;
		}

		/**
		* Overrides the property value

+1 −0

Original line number	Diff line number	Diff line
		@@ -1836,6 +1836,7 @@ public final class CameraManager {
		ctx.getSystemService(DeviceStateManager.class).registerCallback(
		new HandlerExecutor(mDeviceStateHandler), mFoldStateListener);
		} catch (IllegalStateException e) {
		mFoldStateListener = null;
		Log.v(TAG, "Failed to register device state listener!");
		Log.v(TAG, "Device state dependent characteristics updates will not be" +
		"functional!");