Merge "Changes to support reducing noise in active unlock notifications." into tm-dev (c5a7ed29) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+15 −2

Original line number	Diff line number	Diff line
		@@ -11804,11 +11804,23 @@ package android.service.translation {

		package android.service.trust {

		public final class GrantTrustResult implements android.os.Parcelable {
		method public int describeContents();
		method public int getStatus();
		method @NonNull public static String statusToString(int);
		method @NonNull public static android.service.trust.GrantTrustResult withStatus(int);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.service.trust.GrantTrustResult> CREATOR;
		field public static final int STATUS_UNKNOWN = 0; // 0x0
		field public static final int STATUS_UNLOCKED_BY_GRANT = 1; // 0x1
		}

		public class TrustAgentService extends android.app.Service {
		ctor public TrustAgentService();
		method public final void addEscrowToken(byte[], android.os.UserHandle);
		method @Deprecated public final void grantTrust(CharSequence, long, boolean);
		method public final void grantTrust(CharSequence, long, int);
		method @Deprecated public final void grantTrust(CharSequence, long, int);
		method public final void grantTrust(@NonNull CharSequence, long, int, @Nullable java.util.function.Consumer<android.service.trust.GrantTrustResult>);
		method public final void isEscrowTokenActive(long, android.os.UserHandle);
		method public final void lockUser();
		method public final android.os.IBinder onBind(android.content.Intent);
		@@ -11821,7 +11833,8 @@ package android.service.trust {
		method public void onEscrowTokenStateReceived(long, int);
		method public void onTrustTimeout();
		method public void onUnlockAttempt(boolean);
		method public void onUserRequestedUnlock();
		method public void onUserMayRequestUnlock();
		method public void onUserRequestedUnlock(boolean);
		method public final void removeEscrowToken(long, android.os.UserHandle);
		method public final void revokeTrust();
		method public final void setManagingTrust(boolean);

core/java/android/app/trust/ITrustManager.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,8 @@ import android.hardware.biometrics.BiometricSourceType;
		*/
		interface ITrustManager {
		void reportUnlockAttempt(boolean successful, int userId);
		void reportUserRequestedUnlock(int userId);
		void reportUserRequestedUnlock(int userId, boolean dismissKeyguard);
		void reportUserMayRequestUnlock(int userId);
		void reportUnlockLockout(int timeoutMs, int userId);
		void reportEnabledTrustAgentsChanged(int userId);
		void registerTrustListener(in ITrustListener trustListener);

core/java/android/app/trust/TrustManager.java

+17 −2

Original line number	Diff line number	Diff line
		@@ -92,10 +92,25 @@ public class TrustManager {
		* Reports that the user {@code userId} is likely interested in unlocking the device.
		*
		* Requires the {@link android.Manifest.permission#ACCESS_KEYGUARD_SECURE_STORAGE} permission.
		*
		* @param dismissKeyguard whether the user wants to dismiss keyguard
		*/
		public void reportUserRequestedUnlock(int userId, boolean dismissKeyguard) {
		try {
		mService.reportUserRequestedUnlock(userId, dismissKeyguard);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Reports that the user {@code userId} may want to unlock the device soon.
		*
		* Requires the {@link android.Manifest.permission#ACCESS_KEYGUARD_SECURE_STORAGE} permission.
		*/
		public void reportUserRequestedUnlock(int userId) {
		public void reportUserMayRequestUnlock(int userId) {
		try {
		mService.reportUserRequestedUnlock(userId);
		mService.reportUserMayRequestUnlock(userId);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

core/java/android/service/trust/GrantTrustResult.aidl

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.service.trust;

		parcelable GrantTrustResult;

core/java/android/service/trust/GrantTrustResult.java

0 → 100644

+179 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.service.trust;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.os.Parcelable;

		import com.android.internal.util.DataClass;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;

		/**
		* Result type for a callback in a call to
		* {@link TrustAgentService#grantTrust(CharSequence, long, int)}.
		*
		* @hide
		*/
		@DataClass(genHiddenConstructor = true)
		@SystemApi
		public final class GrantTrustResult implements Parcelable {

		/** Result status is unknown to this version of the SDK. */
		public static final int STATUS_UNKNOWN = 0;

		/** The device went from locked to unlocked as a result of the call. */
		public static final int STATUS_UNLOCKED_BY_GRANT = 1;

		@Status
		private int mStatus;

		/** Returns a new {@link GrantTrustResult} with the specified status. */
		@NonNull
		public static GrantTrustResult withStatus(@Status int status) {
		return new GrantTrustResult(status);
		}



		// Code below generated by codegen v1.0.23.
		//
		// DO NOT MODIFY!
		// CHECKSTYLE:OFF Generated code
		//
		// To regenerate run:
		// $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/android/service/trust/GrantTrustResult.java
		//
		// To exclude the generated code from IntelliJ auto-formatting enable (one-time):
		// Settings > Editor > Code Style > Formatter Control
		//@formatter:off


		/** @hide */
		@IntDef(prefix = "STATUS_", value = {
		STATUS_UNKNOWN,
		STATUS_UNLOCKED_BY_GRANT
		})
		@Retention(RetentionPolicy.SOURCE)
		@DataClass.Generated.Member
		public @interface Status {}

		@NonNull
		@DataClass.Generated.Member
		public static String statusToString(@Status int value) {
		switch (value) {
		case STATUS_UNKNOWN:
		return "STATUS_UNKNOWN";
		case STATUS_UNLOCKED_BY_GRANT:
		return "STATUS_UNLOCKED_BY_GRANT";
		default: return Integer.toHexString(value);
		}
		}

		/**
		* Creates a new GrantTrustResult.
		*
		* @hide
		*/
		@DataClass.Generated.Member
		public GrantTrustResult(
		@Status int status) {
		this.mStatus = status;

		if (!(mStatus == STATUS_UNKNOWN)
		&& !(mStatus == STATUS_UNLOCKED_BY_GRANT)) {
		throw new java.lang.IllegalArgumentException(
		"status was " + mStatus + " but must be one of: "
		+ "STATUS_UNKNOWN(" + STATUS_UNKNOWN + "), "
		+ "STATUS_UNLOCKED_BY_GRANT(" + STATUS_UNLOCKED_BY_GRANT + ")");
		}


		// onConstructed(); // You can define this method to get a callback
		}

		@DataClass.Generated.Member
		public @Status int getStatus() {
		return mStatus;
		}

		@Override
		@DataClass.Generated.Member
		public void writeToParcel(@NonNull android.os.Parcel dest, int flags) {
		// You can override field parcelling by defining methods like:
		// void parcelFieldName(Parcel dest, int flags) { ... }

		dest.writeInt(mStatus);
		}

		@Override
		@DataClass.Generated.Member
		public int describeContents() { return 0; }

		/** @hide */
		@SuppressWarnings({"unchecked", "RedundantCast"})
		@DataClass.Generated.Member
		/* package-private */ GrantTrustResult(@NonNull android.os.Parcel in) {
		// You can override field unparcelling by defining methods like:
		// static FieldType unparcelFieldName(Parcel in) { ... }

		int status = in.readInt();

		this.mStatus = status;

		if (!(mStatus == STATUS_UNKNOWN)
		&& !(mStatus == STATUS_UNLOCKED_BY_GRANT)) {
		throw new java.lang.IllegalArgumentException(
		"status was " + mStatus + " but must be one of: "
		+ "STATUS_UNKNOWN(" + STATUS_UNKNOWN + "), "
		+ "STATUS_UNLOCKED_BY_GRANT(" + STATUS_UNLOCKED_BY_GRANT + ")");
		}


		// onConstructed(); // You can define this method to get a callback
		}

		@DataClass.Generated.Member
		public static final @NonNull Parcelable.Creator<GrantTrustResult> CREATOR
		= new Parcelable.Creator<GrantTrustResult>() {
		@Override
		public GrantTrustResult[] newArray(int size) {
		return new GrantTrustResult[size];
		}

		@Override
		public GrantTrustResult createFromParcel(@NonNull android.os.Parcel in) {
		return new GrantTrustResult(in);
		}
		};

		@DataClass.Generated(
		time = 1647878197834L,
		codegenVersion = "1.0.23",
		sourceFile = "frameworks/base/core/java/android/service/trust/GrantTrustResult.java",
		inputSignatures = "public static final int STATUS_UNKNOWN\npublic static final int STATUS_UNLOCKED_BY_GRANT\nprivate @android.service.trust.GrantTrustResult.Status int mStatus\npublic static @android.annotation.NonNull android.service.trust.GrantTrustResult withStatus(int)\nclass GrantTrustResult extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genHiddenConstructor=true)")
		@Deprecated
		private void __metadata() {}


		//@formatter:on
		// End of generated code

		}