summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rubin Xu <rubinxu@google.com> 2016-04-15 15:17:53 +0100
committer Rubin Xu <rubinxu@google.com> 2016-04-15 15:17:53 +0100
commit19c2a57c24fa337030ff31867380b685e9a5b586 (patch)
tree44786b210658a5f7732560191a88ecef19ff8863
parent428fdd104c6877889da1af2d35af41d5c14833c9 (diff)
Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast
Bug: 27532254 Change-Id: Iaca17355d3ec75fa09c36a5353f40d678cc2c812
-rw-r--r--core/java/android/content/Intent.java4
-rw-r--r--core/res/AndroidManifest.xml4
-rw-r--r--services/core/java/com/android/server/pm/UserManagerService.java9
3 files changed, 0 insertions, 17 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 831de4a574fb..fa5a8cb1bcd0 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -3077,10 +3077,6 @@ public class Intent implements Parcelable, Cloneable {
public static final String ACTION_MANAGED_PROFILE_UNLOCKED =
"android.intent.action.MANAGED_PROFILE_UNLOCKED";
- /** @hide */
- public static final String ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED =
- "android.intent.action.MANAGED_PROFILE_AVAILABILITY_CHANGED";
-
/**
* Broadcast sent to the primary user when an associated managed profile has become available.
* Currently this includes when the user disables quiet mode for the profile. Carries an extra
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 1ed93ccfc34b..158db1d7fa7c 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -347,10 +347,6 @@
<protected-broadcast android:name="android.app.action.SYSTEM_UPDATE_POLICY_CHANGED" />
<protected-broadcast android:name="android.app.action.DEVICE_OWNER_CHANGED" />
- <protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_AVAILABILITY_CHANGED" />
- <protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_AVAILABLE" />
- <protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_UNAVAILABLE" />
-
<!-- Added in N -->
<protected-broadcast android:name="android.intent.action.ANR" />
<protected-broadcast android:name="android.intent.action.CALL" />
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 60ea2544cadc..205e4345332d 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -628,15 +628,6 @@ public class UserManagerService extends IUserManager.Stub {
intent.putExtra(Intent.EXTRA_USER_HANDLE, profileHandle.getIdentifier());
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
mContext.sendBroadcastAsUser(intent, parentHandle);
-
- //TODO: remove once Launcher3 is updated.
- Intent oldIntent = new Intent(Intent.ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED);
- oldIntent.putExtra(Intent.EXTRA_QUIET_MODE, inQuietMode);
- oldIntent.putExtra(Intent.EXTRA_USER, profileHandle);
- oldIntent.putExtra(Intent.EXTRA_USER_HANDLE, profileHandle.getIdentifier());
- oldIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
- mContext.sendBroadcastAsUser(oldIntent, parentHandle);
-
}
@Override