Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast" into nyc-dev

Browse Source 
am: b40667eccd

* commit 'b40667eccdd797d08560c33e696625509f90d52b':
  Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast

Change-Id: If16093eef0bc2d5ef3022e2a110ab5eca952e0bf
This commit is contained in:
Rubin Xu
2016-04-22 09:50:57 +00:00
committed by android-build-merger
parent bb1b31a3aa b40667eccd
commit 67c7ac2890
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/Intent.java
View File

@@ -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

4
core/res/AndroidManifest.xml
View File

@@ -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" />

9
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -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