Merge "Remove DATA_SHARING_RESTRICTION_CHANGED broadcast" into sc-dev (58d0a2a9) · Commits · e / os / android_frameworks_base

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

+0 −13

Original line number	Diff line number	Diff line
		@@ -1773,19 +1773,6 @@ 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
		* @deprecated No longer needed as ManagedProvisioning no longer handles
		* {@link UserManager#DISALLOW_SHARE_INTO_MANAGED_PROFILE} restriction changing.
		*/
		// TODO(b/177221010): Remove when Managed Provisioning no longer depend on it.
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		@Deprecated
		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

+0 −1

Original line number	Diff line number	Diff line
		@@ -660,7 +660,6 @@
		<protected-broadcast android:name="android.app.action.PROFILE_OWNER_CHANGED" />
		<protected-broadcast android:name="android.app.action.TRANSFER_OWNERSHIP_COMPLETE" />
		<protected-broadcast android:name="android.app.action.AFFILIATED_PROFILE_TRANSFER_OWNERSHIP_COMPLETE" />
		<protected-broadcast android:name="android.app.action.DATA_SHARING_RESTRICTION_CHANGED" />
		<protected-broadcast android:name="android.app.action.STATSD_STARTED" />
		<protected-broadcast android:name="com.android.server.biometrics.fingerprint.ACTION_LOCKOUT_RESET" />
		<protected-broadcast android:name="com.android.server.biometrics.face.ACTION_LOCKOUT_RESET" />