Snap for 7944517 from 3a2fe51e9ff020a42c70ab8914638e4d6733359b to sc-v2-release (39ffde24) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+26 −2

Original line number	Diff line number	Diff line
		@@ -110,6 +110,11 @@ public class CameraDeviceImpl extends CameraDevice
		private int mRepeatingRequestId = REQUEST_ID_NONE;
		// Latest repeating request list's types
		private int[] mRepeatingRequestTypes;

		// Cache failed requests to process later in case of a repeating error callback
		private int mFailedRepeatingRequestId = REQUEST_ID_NONE;
		private int[] mFailedRepeatingRequestTypes;

		// Map stream IDs to input/output configurations
		private SimpleEntry<Integer, InputConfiguration> mConfiguredInput =
		new SimpleEntry<>(REQUEST_ID_NONE, null);
		@@ -1326,16 +1331,25 @@ public class CameraDeviceImpl extends CameraDevice

		int requestId = mRepeatingRequestId;
		mRepeatingRequestId = REQUEST_ID_NONE;
		mFailedRepeatingRequestId = REQUEST_ID_NONE;
		int[] requestTypes = mRepeatingRequestTypes;
		mRepeatingRequestTypes = null;
		mFailedRepeatingRequestTypes = null;

		long lastFrameNumber;
		try {
		lastFrameNumber = mRemoteDevice.cancelRequest(requestId);
		} catch (IllegalArgumentException e) {
		if (DEBUG) {
		Log.v(TAG, "Repeating request was already stopped for request " + requestId);
		Log.v(TAG, "Repeating request was already stopped for request " +
		requestId);
		}
		// Cache request id and request types in case of a race with
		// "onRepeatingRequestError" which may no yet be scheduled on another thread
		// or blocked by us.
		mFailedRepeatingRequestId = requestId;
		mFailedRepeatingRequestTypes = requestTypes;

		// Repeating request was already stopped. Nothing more to do.
		return;
		}
		@@ -1965,7 +1979,17 @@ public class CameraDeviceImpl extends CameraDevice
		synchronized(mInterfaceLock) {
		// Camera is already closed or no repeating request is present.
		if (mRemoteDevice == null \|\| mRepeatingRequestId == REQUEST_ID_NONE) {
		return; // Camera already closed
		if ((mFailedRepeatingRequestId == repeatingRequestId) &&
		(mFailedRepeatingRequestTypes != null) && (mRemoteDevice != null)) {
		Log.v(TAG, "Resuming stop of failed repeating request with id: " +
		mFailedRepeatingRequestId);

		checkEarlyTriggerSequenceCompleteLocked(mFailedRepeatingRequestId,
		lastFrameNumber, mFailedRepeatingRequestTypes);
		mFailedRepeatingRequestId = REQUEST_ID_NONE;
		mFailedRepeatingRequestTypes = null;
		}
		return;
		}

		// Redirect device callback to the offline session in case we are in the middle

core/java/android/hardware/display/AmbientDisplayConfiguration.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,8 @@ public class AmbientDisplayConfiguration {

		/** {@hide} */
		public boolean quickPickupSensorEnabled(int user) {
		return !TextUtils.isEmpty(quickPickupSensorType())
		return boolSettingDefaultOn(Settings.Secure.DOZE_QUICK_PICKUP_GESTURE, user)
		&& !TextUtils.isEmpty(quickPickupSensorType())
		&& pickupGestureEnabled(user)
		&& !alwaysOnEnabled(user);
		}

core/java/android/view/WindowManager.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -4769,6 +4769,16 @@ public interface WindowManager extends ViewManager {
		return Integer.toString(inputFeature);
		}
		}

		/**
		* True if the window should consume all pointer events itself, regardless of whether they
		* are inside of the window. If the window is modal, its touchable region will expand to the
		* size of its task.
		* @hide
		*/
		public boolean isModal() {
		return (flags & (FLAG_NOT_TOUCH_MODAL \| FLAG_NOT_FOCUSABLE)) == 0;
		}
		}

		/**

core/java/android/view/WindowManagerPolicyConstants.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,9 @@ public interface WindowManagerPolicyConstants {
		*/
		int LAYER_OFFSET_THUMBNAIL = WINDOW_LAYER_MULTIPLIER - 1;

		// TODO(b/207185041): Remove this divider workaround after we full remove leagacy split and
		// make app pair split only have single root then we can just attach the
		// divider to the single root task in shell.
		int SPLIT_DIVIDER_LAYER = TYPE_LAYER_MULTIPLIER * 3;
		int WATERMARK_LAYER = TYPE_LAYER_MULTIPLIER * 100;
		int STRICT_MODE_LAYER = TYPE_LAYER_MULTIPLIER * 101;

core/res/res/layout/splash_screen_view.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@
		android:layout_marginBottom="60dp"
		android:padding="0dp"
		android:background="@null"
		android:forceHasOverlappingRendering="false"
		android:contentDescription="@string/splash_screen_view_branding_description"/>

		</android.window.SplashScreenView>
		No newline at end of file