Snap for 10330433 from f5454e3766bc7e8a0e393546961be667a663fe01 to udc-qpr1-release (41d38f60) · Commits · e / os / android_frameworks_base

apct-tests/perftests/surfaceflinger/AndroidTest.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -58,8 +58,8 @@
		<option name="instrumentation-arg" key="report" value="true" />
		<option name="instrumentation-arg" key="arguments" value="-g" />
		<option name="instrumentation-arg" key="events_to_record" value="instructions,cpu-cycles,raw-l3d-cache-refill,sched:sched_waking" />
		<option name="instrumentation-arg" key="processes_to_record" value="surfaceflinger" />
		<option name="instrumentation-arg" key="symbols_to_report" value=""commit;android::SurfaceFlinger::commit(;composite;android::SurfaceFlinger::composite("" />
		<option name="instrumentation-arg" key="processes_to_record" value="surfaceflinger,android.perftests.surfaceflinger" />
		<option name="instrumentation-arg" key="symbols_to_report" value=""commit;android::SurfaceFlinger::commit(;composite;android::SurfaceFlinger::composite(;outbound;android::SurfaceComposerClient::Transaction::apply(;inbound;android::BnTransactionCompletedListener::onTransact(""/>

		<!-- should match profiling-iterations -->
		<option name="instrumentation-arg" key="test_iterations" value="525" />

core/java/android/app/KeyguardManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -127,6 +127,15 @@ public class KeyguardManager {
		public static final String ACTION_PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL =
		"android.app.action.PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL";

		/**
		* Intent used to prompt user for device credential that is written by
		* {@link #ACTION_PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL} for exiting
		* repair mode.
		* @hide
		*/
		public static final String ACTION_CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL =
		"android.app.action.CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL";

		/**
		* A CharSequence dialog title to show to the user when used with a
		* {@link #ACTION_CONFIRM_DEVICE_CREDENTIAL}.

core/java/android/hardware/fingerprint/FingerprintManager.java

+44 −7

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		private static final int MSG_UDFPS_POINTER_DOWN = 108;
		private static final int MSG_UDFPS_POINTER_UP = 109;
		private static final int MSG_POWER_BUTTON_PRESSED = 110;
		private static final int MSG_UDFPS_OVERLAY_SHOWN = 111;

		/**
		* @hide
		@@ -120,6 +121,24 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		@Retention(RetentionPolicy.SOURCE)
		public @interface EnrollReason {}

		/**
		* Udfps ui event of overlay is shown on the screen.
		* @hide
		*/
		public static final int UDFPS_UI_OVERLAY_SHOWN = 1;
		/**
		* Udfps ui event of the udfps UI being ready (e.g. HBM illumination is enabled).
		* @hide
		*/
		public static final int UDFPS_UI_READY = 2;

		/**
		* @hide
		*/
		@IntDef({UDFPS_UI_OVERLAY_SHOWN, UDFPS_UI_READY})
		@Retention(RetentionPolicy.SOURCE)
		public @interface UdfpsUiEvent{}

		/**
		* Request authentication with any single sensor.
		* @hide
		@@ -475,12 +494,17 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		/**
		* Called when a pointer down event has occurred.
		*/
		public void onPointerDown(int sensorId){ }
		public void onUdfpsPointerDown(int sensorId){ }

		/**
		* Called when a pointer up event has occurred.
		*/
		public void onPointerUp(int sensorId){ }
		public void onUdfpsPointerUp(int sensorId){ }

		/**
		* Called when udfps overlay is shown.
		*/
		public void onUdfpsOverlayShown() { }
		}

		/**
		@@ -1112,14 +1136,14 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		* @hide
		*/
		@RequiresPermission(USE_BIOMETRIC_INTERNAL)
		public void onUiReady(long requestId, int sensorId) {
		public void onUdfpsUiEvent(@UdfpsUiEvent int event, long requestId, int sensorId) {
		if (mService == null) {
		Slog.w(TAG, "onUiReady: no fingerprint service");
		Slog.w(TAG, "onUdfpsUiEvent: no fingerprint service");
		return;
		}

		try {
		mService.onUiReady(requestId, sensorId);
		mService.onUdfpsUiEvent(event, requestId, sensorId);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1365,6 +1389,8 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		case MSG_POWER_BUTTON_PRESSED:
		sendPowerPressed();
		break;
		case MSG_UDFPS_OVERLAY_SHOWN:
		sendUdfpsOverlayShown();
		default:
		Slog.w(TAG, "Unknown message: " + msg.what);

		@@ -1489,7 +1515,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		}

		if (mEnrollmentCallback != null) {
		mEnrollmentCallback.onPointerDown(sensorId);
		mEnrollmentCallback.onUdfpsPointerDown(sensorId);
		}
		}

		@@ -1500,7 +1526,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		mAuthenticationCallback.onUdfpsPointerUp(sensorId);
		}
		if (mEnrollmentCallback != null) {
		mEnrollmentCallback.onPointerUp(sensorId);
		mEnrollmentCallback.onUdfpsPointerUp(sensorId);
		}
		}

		@@ -1512,6 +1538,12 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		}
		}

		private void sendUdfpsOverlayShown() {
		if (mEnrollmentCallback != null) {
		mEnrollmentCallback.onUdfpsOverlayShown();
		}
		}

		/**
		* @hide
		*/
		@@ -1787,6 +1819,11 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		public void onUdfpsPointerUp(int sensorId) {
		mHandler.obtainMessage(MSG_UDFPS_POINTER_UP, sensorId, 0).sendToTarget();
		}

		@Override
		public void onUdfpsOverlayShown() {
		mHandler.obtainMessage(MSG_UDFPS_OVERLAY_SHOWN).sendToTarget();
		}
		};

		}

core/java/android/hardware/fingerprint/FingerprintServiceReceiver.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -75,4 +75,9 @@ public class FingerprintServiceReceiver extends IFingerprintServiceReceiver.Stub
		public void onUdfpsPointerUp(int sensorId) throws RemoteException {

		}

		@Override
		public void onUdfpsOverlayShown() throws RemoteException {

		}
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -193,7 +193,7 @@ interface IFingerprintService {

		// Notifies about the fingerprint UI being ready (e.g. HBM illumination is enabled).
		@EnforcePermission("USE_BIOMETRIC_INTERNAL")
		void onUiReady(long requestId, int sensorId);
		void onUdfpsUiEvent(int event, long requestId, int sensorId);

		// Sets the controller for managing the UDFPS overlay.
		@EnforcePermission("USE_BIOMETRIC_INTERNAL")