Merge "Enforce agent allowlist in AppFunctionAccessService" into main (b7138e53) · Commits · e / os / android_frameworks_base

core/api/module-lib-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,7 @@ package android.content.pm {

		@FlaggedApi("android.permission.flags.enhanced_confirmation_mode_apis_enabled") public class SignedPackage {
		method @NonNull public byte[] getCertificateDigest();
		method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @Nullable public byte[] getCertificateDigestOrNull();
		method @NonNull public String getPackageName();
		}

core/api/test-current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -789,7 +789,10 @@ package android.app.admin {
		package android.app.appfunctions {

		@FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public final class AppFunctionManager {
		method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_APP_FUNCTION_ACCESS) public java.util.List<android.content.pm.SignedPackage> getAgentAllowlist();
		method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @NonNull public java.util.Set<java.lang.String> getDeviceSettingPackages();
		method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_APP_FUNCTION_ACCESS) public boolean isAgentAllowlistEnabled();
		method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_APP_FUNCTION_ACCESS) public void setAgentAllowlistEnabled(boolean);
		field public static final int ACCESS_FLAG_MASK_ALL = 31; // 0x1f
		field public static final int ACCESS_FLAG_MASK_OTHER = 6; // 0x6
		field public static final int ACCESS_FLAG_MASK_USER = 24; // 0x18
		@@ -1221,6 +1224,12 @@ package android.content.pm {
		ctor public ShortcutManager(android.content.Context);
		}

		@FlaggedApi("android.permission.flags.enhanced_confirmation_mode_apis_enabled") public class SignedPackage {
		method @NonNull public byte[] getCertificateDigest();
		method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @Nullable public byte[] getCertificateDigestOrNull();
		method @NonNull public String getPackageName();
		}

		public class UserInfo implements android.os.Parcelable {
		ctor public UserInfo(int, String, int);
		ctor public UserInfo(int, String, String, int);

core/java/android/app/appfunctions/AppFunctionAccessServiceInterface.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -17,9 +17,11 @@
		package android.app.appfunctions;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.content.pm.SignedPackage;

		import java.util.List;
		import java.util.Set;

		/**
		* @hide
		@@ -46,7 +48,7 @@ public interface AppFunctionAccessServiceInterface {
		void revokeSelfAccess(@NonNull String targetPackageName);

		/** Set the agent allowlist */
		void setAgentAllowlist(@NonNull List<SignedPackage> agentAllowlist);
		void setAgentAllowlist(@Nullable Set<SignedPackage> agentAllowlist);

		/** @see AppFunctionManager#getValidAgents() */
		@NonNull

core/java/android/app/appfunctions/AppFunctionManager.java

+56 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,8 @@ import android.app.appfunctions.AppFunctionManagerHelper.AppFunctionNotFoundExce
		import android.app.appsearch.AppSearchManager;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.SignedPackage;
		import android.content.pm.SignedPackageParcel;
		import android.os.CancellationSignal;
		import android.os.ICancellationSignal;
		import android.os.OutcomeReceiver;
		@@ -51,6 +53,7 @@ import com.android.internal.R;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.ArrayList;
		import java.util.List;
		import java.util.Objects;
		import java.util.Set;
		@@ -841,6 +844,59 @@ public final class AppFunctionManager {
		return new ArraySet<>(deviceSettingPackages);
		}

		/**
		* Gets the current agent allowlist
		* @hide
		*/
		@TestApi
		@RequiresPermission(MANAGE_APP_FUNCTION_ACCESS)
		@FlaggedApi(Flags.FLAG_APP_FUNCTION_ACCESS_API_ENABLED)
		public @NonNull List<SignedPackage> getAgentAllowlist() {
		try {
		List<SignedPackageParcel> packageParcels = mService.getAgentAllowlist();
		int packageParcelsSize = packageParcels.size();
		List<SignedPackage> packages = new ArrayList<>(packageParcelsSize);
		for (int i = 0; i < packageParcelsSize; i++) {
		packages.add(new SignedPackage(packageParcels.get(i)));
		}
		return packages;
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Gets whether or not the agent allowlist is enabled
		* TODO b/413093397: Remove once list is ready for permanent enable
		* @hide
		*/
		@TestApi
		@RequiresPermission(MANAGE_APP_FUNCTION_ACCESS)
		@FlaggedApi(Flags.FLAG_APP_FUNCTION_ACCESS_API_ENABLED)
		public boolean isAgentAllowlistEnabled() {
		try {
		return mService.isAgentAllowlistEnabled();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Gets whether or not the agent allowlist is enabled
		* TODO b/413093397: Remove once list is ready for permanent enable
		* @hide
		*/
		@TestApi
		@RequiresPermission(MANAGE_APP_FUNCTION_ACCESS)
		@FlaggedApi(Flags.FLAG_APP_FUNCTION_ACCESS_API_ENABLED)
		public void setAgentAllowlistEnabled(boolean enabled) {
		try {
		mService.setAgentAllowlistEnabled(enabled);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		private static class CallbackWrapper extends IAppFunctionEnabledCallback.Stub {

		private final OutcomeReceiver<Void, Exception> mCallback;

core/java/android/app/appfunctions/IAppFunctionManager.aidl

+10 −1

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@ import android.app.appfunctions.ExecuteAppFunctionAidlRequest;
		import android.app.appfunctions.IAppFunctionEnabledCallback;
		import android.app.appfunctions.IExecuteAppFunctionCallback;
		import android.os.ICancellationSignal;

		import android.os.UserHandle;
		import android.content.pm.SignedPackageParcel;

		import java.util.List;
		/**
		@@ -85,4 +85,13 @@ interface IAppFunctionManager {
		List<String> getValidTargets(
		int targetUserId
		);

		@EnforcePermission("MANAGE_APP_FUNCTION_ACCESS")
		List<SignedPackageParcel> getAgentAllowlist();

		@EnforcePermission("MANAGE_APP_FUNCTION_ACCESS")
		void setAgentAllowlistEnabled(boolean enabled);

		@EnforcePermission("MANAGE_APP_FUNCTION_ACCESS")
		boolean isAgentAllowlistEnabled();
		}