Snap for 10810697 from 690cde692efa22c6f5dad8d81f58b46293e8a349 to udc-qpr1-release (157e8d3f) · Commits · e / os / android_frameworks_base

core/java/android/hardware/biometrics/IBiometricAuthenticator.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,8 @@ interface IBiometricAuthenticator {
		// startPreparedClient().
		void prepareForAuthentication(boolean requireConfirmation, IBinder token, long operationId,
		int userId, IBiometricSensorReceiver sensorReceiver, String opPackageName,
		long requestId, int cookie, boolean allowBackgroundAuthentication);
		long requestId, int cookie, boolean allowBackgroundAuthentication,
		boolean isForLegacyFingerprintManager);

		// Starts authentication with the previously prepared client.
		void startPreparedClient(int cookie);

core/java/android/hardware/fingerprint/IFingerprintService.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,8 @@ interface IFingerprintService {
		@EnforcePermission("MANAGE_BIOMETRIC")
		void prepareForAuthentication(IBinder token, long operationId,
		IBiometricSensorReceiver sensorReceiver, in FingerprintAuthenticateOptions options, long requestId,
		int cookie, boolean allowBackgroundAuthentication);
		int cookie, boolean allowBackgroundAuthentication,
		boolean isForLegacyFingerprintManager);

		// Starts authentication with the previously prepared client.
		@EnforcePermission("MANAGE_BIOMETRIC")

core/java/android/hardware/usb/DisplayPortAltModeInfo.java

+31 −7

Original line number	Diff line number	Diff line
		@@ -200,19 +200,43 @@ public final class DisplayPortAltModeInfo implements Parcelable {
		dest.writeInt(mLinkTrainingStatus);
		}

		private String displayPortAltModeStatusToString(@DisplayPortAltModeStatus int status) {
		switch (status) {
		case DISPLAYPORT_ALT_MODE_STATUS_NOT_CAPABLE:
		return "not capable";
		case DISPLAYPORT_ALT_MODE_STATUS_CAPABLE_DISABLED:
		return "capable disabled";
		case DISPLAYPORT_ALT_MODE_STATUS_ENABLED:
		return "enabled";
		default:
		return "unknown";
		}
		}

		private String linkTrainingStatusToString(@LinkTrainingStatus int status) {
		switch (status) {
		case LINK_TRAINING_STATUS_SUCCESS:
		return "success";
		case LINK_TRAINING_STATUS_FAILURE:
		return "failure";
		default:
		return "unknown";
		}
		}

		@NonNull
		@Override
		public String toString() {
		return "DisplayPortAltModeInfo{partnerSink="
		+ mPartnerSinkStatus
		+ " cable="
		+ mCableStatus
		+ " numLanes="
		+ displayPortAltModeStatusToString(mPartnerSinkStatus)
		+ ", cable="
		+ displayPortAltModeStatusToString(mCableStatus)
		+ ", numLanes="
		+ mNumLanes
		+ " hotPlugDetect="
		+ ", hotPlugDetect="
		+ mHotPlugDetect
		+ " linkTrainingStatus="
		+ mLinkTrainingStatus
		+ ", linkTrainingStatus="
		+ linkTrainingStatusToString(mLinkTrainingStatus)
		+ "}";
		}

core/java/android/view/HandwritingInitiator.java

+32 −2

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.graphics.Rect;
		import android.graphics.RectF;
		import android.graphics.Region;
		import android.view.inputmethod.InputMethodManager;
		import android.widget.EditText;
		import android.widget.TextView;

		import com.android.internal.annotations.VisibleForTesting;
		@@ -81,6 +82,8 @@ public class HandwritingInitiator {
		private int mConnectionCount = 0;
		private final InputMethodManager mImm;

		private final int[] mTempLocation = new int[2];

		private final Rect mTempRect = new Rect();

		private final RectF mTempRectF = new RectF();
		@@ -429,7 +432,19 @@ public class HandwritingInitiator {
		return null;
		}

		private static void requestFocusWithoutReveal(View view) {
		private void requestFocusWithoutReveal(View view) {
		if (view instanceof EditText editText && !mState.mStylusDownWithinEditorBounds) {
		// If the stylus down point was inside the EditText's bounds, then the EditText will
		// automatically set its cursor position nearest to the stylus down point when it
		// gains focus. If the stylus down point was outside the EditText's bounds (within
		// the extended handwriting bounds), then we must calculate and set the cursor
		// position manually.
		view.getLocationInWindow(mTempLocation);
		int offset = editText.getOffsetForPosition(
		mState.mStylusDownX - mTempLocation[0],
		mState.mStylusDownY - mTempLocation[1]);
		editText.setSelection(offset);
		}
		if (view.getRevealOnFocusHint()) {
		view.setRevealOnFocusHint(false);
		view.requestFocus();
		@@ -457,6 +472,10 @@ public class HandwritingInitiator {
		if (getViewHandwritingArea(connectedView, handwritingArea)
		&& isInHandwritingArea(handwritingArea, x, y, connectedView, isHover)
		&& shouldTriggerStylusHandwritingForView(connectedView)) {
		if (!isHover && mState != null) {
		mState.mStylusDownWithinEditorBounds =
		contains(handwritingArea, x, y, 0f, 0f, 0f, 0f);
		}
		return connectedView;
		}
		}
		@@ -475,7 +494,12 @@ public class HandwritingInitiator {
		}

		final float distance = distance(handwritingArea, x, y);
		if (distance == 0f) return view;
		if (distance == 0f) {
		if (!isHover && mState != null) {
		mState.mStylusDownWithinEditorBounds = true;
		}
		return view;
		}
		if (distance < minDistance) {
		minDistance = distance;
		bestCandidate = view;
		@@ -657,6 +681,12 @@ public class HandwritingInitiator {
		*/
		private boolean mExceedHandwritingSlop;

		/**
		* Whether the stylus down point of the MotionEvent sequence was within the editor's bounds
		* (not including the extended handwriting bounds).
		*/
		private boolean mStylusDownWithinEditorBounds;

		/**
		* A view which has requested focus and is pending input connection creation. When an input
		* connection is created for the view, a handwriting session should be started for the view.

core/java/com/android/internal/policy/DecorView.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -1160,7 +1160,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
		mForceWindowDrawsBarBackgrounds, requestedVisibleTypes);
		boolean oldDrawLegacy = mDrawLegacyNavigationBarBackground;
		mDrawLegacyNavigationBarBackground =
		(mWindow.getAttributes().flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) == 0;
		((requestedVisibleTypes \| mLastForceConsumingTypes)
		& WindowInsets.Type.navigationBars()) != 0
		&& (mWindow.getAttributes().flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) == 0;
		if (oldDrawLegacy != mDrawLegacyNavigationBarBackground) {
		mDrawLegacyNavigationBarBackgroundHandled =
		mWindow.onDrawLegacyNavigationBarBackgroundChanged(