Merge cherrypicks of [4315359, 4315389, 4315390, 4315519, 4315520, 4315360,... (96d0c0cf) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityStack.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -1654,13 +1654,6 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
		void addToStopping(ActivityRecord r, boolean scheduleIdle, boolean idleDelayed) {
		if (!mStackSupervisor.mStoppingActivities.contains(r)) {
		mStackSupervisor.mStoppingActivities.add(r);

		// Some activity is waiting for another activity to become visible before it's being
		// stopped, which means that we also want to wait with stopping this one to avoid
		// flickers.
		if (!mStackSupervisor.mActivitiesWaitingForVisibleActivity.isEmpty()) {
		mStackSupervisor.mActivitiesWaitingForVisibleActivity.add(r);
		}
		}

		// If we already have a few activities waiting to stop, then give up

+2 −2

Original line number	Diff line number	Diff line
		@@ -2623,6 +2623,7 @@ public class AudioService extends IAudioService.Stub
		broadcastRingerMode(AudioManager.RINGER_MODE_CHANGED_ACTION, ringerMode);
		}

		@GuardedBy("mSettingsLock")
		private void muteRingerModeStreams() {
		// Mute stream if not previously muted by ringer mode and (ringer mode
		// is not RINGER_MODE_NORMAL OR stream is zen muted) and stream is affected by ringer mode.
		@@ -2710,9 +2711,8 @@ public class AudioService extends IAudioService.Stub
		synchronized(mSettingsLock) {
		change = mRingerMode != ringerMode;
		mRingerMode = ringerMode;
		}

		muteRingerModeStreams();
		}

		// Post a persist ringer mode msg
		if (persist) {