Merge "Make AppFunction permissions public" into main (6b27ad03) · Commits · e / os / android_frameworks_base

core/api/current.txt

+3 −2

core/api/system-current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -150,7 +150,6 @@ package android {
	field @FlaggedApi("com.android.window.flags.untrusted_embedding_any_app_permission") public static final String EMBED_ANY_APP_IN_UNTRUSTED_MODE = "android.permission.EMBED_ANY_APP_IN_UNTRUSTED_MODE";		field @FlaggedApi("com.android.window.flags.untrusted_embedding_any_app_permission") public static final String EMBED_ANY_APP_IN_UNTRUSTED_MODE = "android.permission.EMBED_ANY_APP_IN_UNTRUSTED_MODE";
	field @FlaggedApi("android.content.pm.emergency_install_permission") public static final String EMERGENCY_INSTALL_PACKAGES = "android.permission.EMERGENCY_INSTALL_PACKAGES";		field @FlaggedApi("android.content.pm.emergency_install_permission") public static final String EMERGENCY_INSTALL_PACKAGES = "android.permission.EMERGENCY_INSTALL_PACKAGES";
	field public static final String ENTER_CAR_MODE_PRIORITIZED = "android.permission.ENTER_CAR_MODE_PRIORITIZED";		field public static final String ENTER_CAR_MODE_PRIORITIZED = "android.permission.ENTER_CAR_MODE_PRIORITIZED";
	field @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public static final String EXECUTE_APP_FUNCTIONS = "android.permission.EXECUTE_APP_FUNCTIONS";
	field @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public static final String EXECUTE_APP_FUNCTIONS_TRUSTED = "android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED";		field @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public static final String EXECUTE_APP_FUNCTIONS_TRUSTED = "android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED";
	field public static final String EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS = "android.permission.EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS";		field public static final String EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS = "android.permission.EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS";
	field public static final String FORCE_BACK = "android.permission.FORCE_BACK";		field public static final String FORCE_BACK = "android.permission.FORCE_BACK";

core/res/AndroidManifest.xml

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -98,6 +98,7 @@ package android {
	field public static final String DUMP = "android.permission.DUMP";		field public static final String DUMP = "android.permission.DUMP";
	field public static final String ENFORCE_UPDATE_OWNERSHIP = "android.permission.ENFORCE_UPDATE_OWNERSHIP";		field public static final String ENFORCE_UPDATE_OWNERSHIP = "android.permission.ENFORCE_UPDATE_OWNERSHIP";
	field public static final String EXECUTE_APP_ACTION = "android.permission.EXECUTE_APP_ACTION";		field public static final String EXECUTE_APP_ACTION = "android.permission.EXECUTE_APP_ACTION";
			field @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public static final String EXECUTE_APP_FUNCTIONS = "android.permission.EXECUTE_APP_FUNCTIONS";
	field public static final String EXPAND_STATUS_BAR = "android.permission.EXPAND_STATUS_BAR";		field public static final String EXPAND_STATUS_BAR = "android.permission.EXPAND_STATUS_BAR";
	field public static final String FACTORY_TEST = "android.permission.FACTORY_TEST";		field public static final String FACTORY_TEST = "android.permission.FACTORY_TEST";
	field public static final String FOREGROUND_SERVICE = "android.permission.FOREGROUND_SERVICE";		field public static final String FOREGROUND_SERVICE = "android.permission.FOREGROUND_SERVICE";
	@@ -8892,8 +8893,8 @@ package android.app.appfunctions {
	}		}

	@FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public final class AppFunctionManager {		@FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public final class AppFunctionManager {
	method @RequiresPermission(anyOf={"android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED", "android.permission.EXECUTE_APP_FUNCTIONS"}, conditional=true) public void executeAppFunction(@NonNull android.app.appfunctions.ExecuteAppFunctionRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.CancellationSignal, @NonNull android.os.OutcomeReceiver<android.app.appfunctions.ExecuteAppFunctionResponse,android.app.appfunctions.AppFunctionException>);		method @RequiresPermission(anyOf={"android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED", android.Manifest.permission.EXECUTE_APP_FUNCTIONS}, conditional=true) public void executeAppFunction(@NonNull android.app.appfunctions.ExecuteAppFunctionRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.CancellationSignal, @NonNull android.os.OutcomeReceiver<android.app.appfunctions.ExecuteAppFunctionResponse,android.app.appfunctions.AppFunctionException>);
	method @RequiresPermission(anyOf={"android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED", "android.permission.EXECUTE_APP_FUNCTIONS"}, conditional=true) public void isAppFunctionEnabled(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);		method @RequiresPermission(anyOf={"android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED", android.Manifest.permission.EXECUTE_APP_FUNCTIONS}, conditional=true) public void isAppFunctionEnabled(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);
	method public void isAppFunctionEnabled(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);		method public void isAppFunctionEnabled(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);
	method public void setAppFunctionEnabled(@NonNull String, int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,java.lang.Exception>);		method public void setAppFunctionEnabled(@NonNull String, int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,java.lang.Exception>);
	field public static final int APP_FUNCTION_STATE_DEFAULT = 0; // 0x0		field public static final int APP_FUNCTION_STATE_DEFAULT = 0; // 0x0

Original line number	Original line	Diff line number	Diff line
	@@ -8307,20 +8307,21 @@
	android:featureFlag="android.app.appfunctions.flags.enable_app_function_manager"		android:featureFlag="android.app.appfunctions.flags.enable_app_function_manager"
	android:protectionLevel="signature" />		android:protectionLevel="signature" />

	<!-- @SystemApi Allows a trusted application to perform actions on behalf of users inside of		<!-- Allows a trusted application to perform actions on behalf of users inside of
	applications with privacy guarantees from the system.		applications with privacy guarantees from the system.
	<p>This permission is currently only granted to system packages in the		<p>This permission is currently only granted to system packages in the
	{@link android.app.role.SYSTEM_UI_INTELLIGENCE} role which complies with privacy		{@link android.app.role.SYSTEM_UI_INTELLIGENCE} role which complies with privacy
	requirements outlined in the Android CDD section "9.8.6 Content Capture".		requirements outlined in the Android CDD section "9.8.6 Content Capture".
	<p>Apps are not able to opt-out from caller having this permission.		<p>Apps are not able to opt-out from caller having this permission.
	<p>Protection level: internal\|role		<p>Protection level: internal\|role
			@SystemApi
	@hide		@hide
	@FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") -->		@FlaggedApi(android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER) -->
	<permission android:name="android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED"		<permission android:name="android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED"
	android:featureFlag="android.app.appfunctions.flags.enable_app_function_manager"		android:featureFlag="android.app.appfunctions.flags.enable_app_function_manager"
	android:protectionLevel="internal\|role" />		android:protectionLevel="internal\|role" />

	<!-- @SystemApi Allows an application to perform actions on behalf of users inside of		<!-- Allows an application to perform actions on behalf of users inside of
	applications.		applications.
	<p>This permission is currently only granted to preinstalled / system apps having the		<p>This permission is currently only granted to preinstalled / system apps having the
	{@link android.app.role.ASSISTANT} role.		{@link android.app.role.ASSISTANT} role.
	@@ -8328,8 +8329,7 @@
	limiting to only callers with {@link android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED}		limiting to only callers with {@link android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED}
	instead.		instead.
	<p>Protection level: internal\|role		<p>Protection level: internal\|role
	@hide		@FlaggedApi(android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER) -->
	@FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") -->
	<permission android:name="android.permission.EXECUTE_APP_FUNCTIONS"		<permission android:name="android.permission.EXECUTE_APP_FUNCTIONS"
	android:featureFlag="android.app.appfunctions.flags.enable_app_function_manager"		android:featureFlag="android.app.appfunctions.flags.enable_app_function_manager"
	android:protectionLevel="internal\|role" />		android:protectionLevel="internal\|role" />