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

Merge "Suspend work status bar icon should be removed when work profile is deleted." into nyc-dev

Browse Source 
am: eeef75b

* commit 'eeef75b6266dee8127bb0bcd1c241059602ca791':
  Suspend work status bar icon should be removed when work profile is deleted.

Change-Id: I6bc8d58071b4728e2142febc51120f0d68d88988
This commit is contained in:
Nicolas Prevot
2016-04-13 11:07:43 +00:00
committed by android-build-merger
parent b2d707953a eeef75b626
commit d1261c578e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
View File

@@ -139,6 +139,7 @@ public class PhoneStatusBarPolicy implements Callback, RotationLockController.Ro
filter.addAction(TelecomManager.ACTION_CURRENT_TTY_MODE_CHANGED);
filter.addAction(Intent.ACTION_MANAGED_PROFILE_AVAILABLE);
filter.addAction(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE);
filter.addAction(Intent.ACTION_MANAGED_PROFILE_REMOVED);
mContext.registerReceiver(mIntentReceiver, filter, null, mHandler);
// listen for user / profile change.
@@ -509,7 +510,8 @@ public class PhoneStatusBarPolicy implements Callback, RotationLockController.Ro
} else if (action.equals(TelecomManager.ACTION_CURRENT_TTY_MODE_CHANGED)) {
updateTTY(intent);
} else if (action.equals(Intent.ACTION_MANAGED_PROFILE_AVAILABLE) ||
action.equals(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE)) {
action.equals(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE) ||
action.equals(Intent.ACTION_MANAGED_PROFILE_REMOVED)) {
updateQuietState();
updateManagedProfile();
} else if (action.equals(AudioManager.ACTION_HEADSET_PLUG)) {