diff options
| author | 2016-04-22 09:25:02 +0000 | |
|---|---|---|
| committer | 2016-04-22 09:25:03 +0000 | |
| commit | b40667eccdd797d08560c33e696625509f90d52b (patch) | |
| tree | 3adaba70e0619cb36b45e69ff0665f8620780558 | |
| parent | ff0ff67eccd784ccdd35b91ed182c50bb8df2d71 (diff) | |
| parent | 19c2a57c24fa337030ff31867380b685e9a5b586 (diff) | |
Merge "Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast" into nyc-dev
| -rw-r--r-- | core/java/android/content/Intent.java | 4 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 9 |
3 files changed, 0 insertions, 17 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 996ccba3c1b7..c8bf4d65418c 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3078,10 +3078,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 a59809699be2..eb0c7424e3f5 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 93e4d313cce2..7ea59190981a 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -632,15 +632,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 |