am 895fcefe: am c4f32bb7: am 8f52135f: Merge "Allow apps from managed profles... (a6df20fd) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -689,6 +689,12 @@ public abstract class BaseStatusBar extends SystemUI implements
		}
		}

		protected boolean isCurrentProfile(int userId) {
		synchronized (mCurrentProfiles) {
		return mCurrentProfiles.get(userId) != null;
		}
		}

		@Override
		public String getCurrentMediaNotificationKey() {
		return null;

+8 −6

Original line number	Diff line number	Diff line
		@@ -922,7 +922,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		filter.addAction("fake_artwork");
		}
		filter.addAction(ACTION_DEMO);
		context.registerReceiver(mBroadcastReceiver, filter);
		context.registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, filter, null, null);

		// listen for USER_SETUP_COMPLETE setting (per-user)
		resetUserSetupObserver();
		@@ -3096,6 +3096,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		if (DEBUG) Log.v(TAG, "onReceive: " + intent);
		String action = intent.getAction();
		if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)) {
		if (isCurrentProfile(getSendingUserId())) {
		int flags = CommandQueue.FLAG_EXCLUDE_NONE;
		String reason = intent.getStringExtra("reason");
		if (reason != null && reason.equals(SYSTEM_DIALOG_REASON_RECENT_APPS)) {
		@@ -3103,6 +3104,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}
		animateCollapsePanels(flags);
		}
		}
		else if (Intent.ACTION_SCREEN_OFF.equals(action)) {
		mScreenOn = false;
		notifyNavigationBarScreenOn(false);