From 1192835a56aa6c26e9e43797604da307b512086e Mon Sep 17 00:00:00 2001 From: kholoud mohamed Date: Mon, 29 Mar 2021 16:05:50 +0100 Subject: [PATCH] Remove DATA_SHARING_RESTRICTION_CHANGED broadcast This broadcast was previously used to notify Managed Provisioning that data sharing restrtiction has changed, this is no longer handled in Managed Provisioning and is now handled in DPMS. Fixes: 177221010 Test: N/A Change-Id: I4e3fbb94c41f944afb41e226c06d1fffcc8bc264 --- .../java/android/app/admin/DevicePolicyManager.java | 13 ------------- core/res/AndroidManifest.xml | 1 - 2 files changed, 14 deletions(-) diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index e4120913c9f77..e30b5b25540ff 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -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 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index fc264f313d709..3ebb10e37b9fb 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -660,7 +660,6 @@ -