Merge "[automerger skipped] Merge "Ensure policy has no absurdly long strings"... (27778a69) · Commits · e / os / android_frameworks_base

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

+9 −13

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

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

		private static final String TAG = "CameraCharacteristics";

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

		/**
		* Overrides the property value

+0 −1

Original line number	Diff line number	Diff line
		@@ -1836,7 +1836,6 @@ 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!");

+1 −4

Original line number	Diff line number	Diff line
		@@ -248,10 +248,7 @@ class BLASTSyncEngine {
		Slog.e(TAG, "WM sent Transaction to organized, but never received" +
		" commit callback. Application ANR likely to follow.");
		Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
		synchronized (mWm.mGlobalLock) {
		onCommitted(merged.mNativeObject != 0
		? merged : mWm.mTransactionFactory.get());
		}
		onCommitted(merged);
		}
		};
		CommitCallback callback = new CommitCallback();