Merge "Add EXTRA_EXCLUDED_USERS key to DocumentsContract" into main (ff02350e) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -1043,6 +1043,7 @@ java_aconfig_library {
		name: "android.multiuser.flags-aconfig-java",
		aconfig_declarations: "android.multiuser.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		min_sdk_version: "30",
		}

		// XR

+1 −0

Original line number	Diff line number	Diff line
		@@ -12584,6 +12584,7 @@ package android.provider {
		field public static final String ACTION_MANAGE_DOCUMENT = "android.provider.action.MANAGE_DOCUMENT";
		field public static final String DOWNLOADS_PROVIDER_AUTHORITY = "downloads";
		field public static final String EXTERNAL_STORAGE_PROVIDER_AUTHORITY = "com.android.externalstorage.documents";
		field @FlaggedApi("android.multiuser.enable_moving_content_into_private_space") public static final String EXTRA_EXCLUDED_USERS = "android.provider.extra.EXCLUDED_USERS";
		field public static final String EXTRA_SHOW_ADVANCED = "android.provider.extra.SHOW_ADVANCED";
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -449,6 +449,7 @@ flag {
		namespace: "profile_experiences"
		description: "Enable moving content into the Private Space"
		bug: "360066001"
		is_exported: true
		}

		flag {

+16 −0

Original line number	Diff line number	Diff line
		@@ -193,6 +193,22 @@ public final class DocumentsContract {
		*/
		public static final String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF";

		/**
		* Set this in a DocumentsUI intent to add users ids to be excluded from the roots list.
		*
		* This will only be supported if there is at least one user to be shown in DocumentsUI picker.
		*
		* The caller must also hold either {@link android.Manifest.permission#INTERACT_ACROSS_USERS}
		* or
		* {@link android.Manifest.permission#INTERACT_ACROSS_USERS_FULL} for the set user(s) to be
		* excluded.
		*
		* {@hide}
		*/
		@SystemApi
		@FlaggedApi(android.multiuser.Flags.FLAG_ENABLE_MOVING_CONTENT_INTO_PRIVATE_SPACE)
		public static final String EXTRA_EXCLUDED_USERS = "android.provider.extra.EXCLUDED_USERS";

		/**
		* An extra number of degrees that an image should be rotated during the
		* decode process to be presented correctly.

+1 −0

Original line number	Diff line number	Diff line
		@@ -189,6 +189,7 @@ applications that come with the platform

		<privapp-permissions package="com.android.privatespace">
		<permission name="android.permission.ACCESS_HIDDEN_PROFILES_FULL"/>
		<permission name="android.permission.INTERACT_ACROSS_USERS" />
		</privapp-permissions>

		<privapp-permissions package="com.android.providers.calendar">