Merge "Implement DISALLOW_SHARE_INTO_MANAGED_PROFILE" (82548f4b) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -32482,6 +32482,7 @@ package android.os {
		field public static final java.lang.String DISALLOW_SAFE_BOOT = "no_safe_boot";
		field public static final java.lang.String DISALLOW_SET_USER_ICON = "no_set_user_icon";
		field public static final java.lang.String DISALLOW_SET_WALLPAPER = "no_set_wallpaper";
		field public static final java.lang.String DISALLOW_SHARE_INTO_MANAGED_PROFILE = "no_sharing_into_profile";
		field public static final java.lang.String DISALLOW_SHARE_LOCATION = "no_share_location";
		field public static final java.lang.String DISALLOW_SMS = "no_sms";
		field public static final java.lang.String DISALLOW_SYSTEM_ERROR_DIALOGS = "no_system_error_dialogs";

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -156,6 +156,7 @@ package android.app.admin {
		method public boolean isDeviceManaged();
		field public static final java.lang.String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED";
		field public static final java.lang.String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_DISALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_DISALLOWED";
		field public static final java.lang.String ACTION_DATA_SHARING_RESTRICTION_APPLIED = "android.app.action.DATA_SHARING_RESTRICTION_APPLIED";
		field public static final java.lang.String EXTRA_RESTRICTION = "android.app.extra.RESTRICTION";
		}

core/java/android/app/admin/DevicePolicyManager.java

+27 −0

Original line number	Diff line number	Diff line
		@@ -1253,6 +1253,26 @@ public class DevicePolicyManager {
		public static final String ACTION_SYSTEM_UPDATE_POLICY_CHANGED
		= "android.app.action.SYSTEM_UPDATE_POLICY_CHANGED";

		/**
		* Broadcast action to notify ManagedProvisioning that
		* {@link UserManager#DISALLOW_SHARE_INTO_MANAGED_PROFILE} restriction has changed.
		* @hide
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_DATA_SHARING_RESTRICTION_CHANGED =
		"android.app.action.DATA_SHARING_RESTRICTION_CHANGED";

		/**
		* Broadcast action from ManagedProvisioning to notify that the latest change to
		* {@link UserManager#DISALLOW_SHARE_INTO_MANAGED_PROFILE} restriction has been successfully
		* applied (cross profile intent filters updated). Only usesd for CTS tests.
		* @hide
		*/
		@TestApi
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_DATA_SHARING_RESTRICTION_APPLIED =
		"android.app.action.DATA_SHARING_RESTRICTION_APPLIED";

		/**
		* Permission policy to prompt user for new permission requests for runtime permissions.
		* Already granted or denied permissions are not affected by this.
		@@ -6057,6 +6077,13 @@ public class DevicePolicyManager {
		* Called by a profile owner of a managed profile to remove the cross-profile intent filters
		* that go from the managed profile to the parent, or from the parent to the managed profile.
		* Only removes those that have been set by the profile owner.
		* <p>
		* <em>Note</em>: A list of default cross profile intent filters are set up by the system when
		* the profile is created, some of them ensure the proper functioning of the profile, while
		* others enable sharing of data from the parent to the managed profile for user convenience.
		* These default intent filters are not cleared when this API is called. If the default cross
		* profile data sharing is not desired, they can be disabled with
		* {@link UserManager#DISALLOW_SHARE_INTO_MANAGED_PROFILE}.
		*
		* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
		* @throws SecurityException if {@code admin} is not a device or profile owner.

core/java/android/os/UserManager.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -891,6 +891,27 @@ public class UserManager {
		*/
		public static final String DISALLOW_USER_SWITCH = "no_user_switch";

		/**
		* Specifies whether the user can share file / picture / data from the primary user into the
		* managed profile, either by sending them from the primary side, or by picking up data within
		* an app in the managed profile.
		* <p>
		* When a managed profile is created, the system allows the user to send data from the primary
		* side to the profile by setting up certain default cross profile intent filters. If
		* this is undesired, this restriction can be set to disallow it. Note that this restriction
		* will not block any sharing allowed by explicit
		* {@link DevicePolicyManager#addCrossProfileIntentFilter} calls by the profile owner.
		* <p>
		* This restriction is only meaningful when set by profile owner. When it is set by device
		* owner, it does not have any effect.
		* <p>
		* The default value is <code>false</code>.
		*
		* @see DevicePolicyManager#addUserRestriction(ComponentName, String)
		* @see DevicePolicyManager#clearUserRestriction(ComponentName, String)
		* @see #getUserRestrictions()
		*/
		public static final String DISALLOW_SHARE_INTO_MANAGED_PROFILE = "no_sharing_into_profile";
		/**
		* Application restriction key that is used to indicate the pending arrival
		* of real restrictions for the app.

core/res/AndroidManifest.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -576,6 +576,9 @@
		<protected-broadcast android:name="android.app.action.PROFILE_OWNER_CHANGED" />
		<protected-broadcast android:name="android.app.action.TRANSFER_OWNERSHIP_COMPLETE" />

		<!-- Added in P -->
		<protected-broadcast android:name="android.app.action.DATA_SHARING_RESTRICTION_CHANGED" />

		<!-- ====================================================================== -->
		<!-- RUNTIME PERMISSIONS -->
		<!-- ====================================================================== -->