diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-12 01:49:32 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-12 01:49:32 +0000 |
| commit | 96d0c0cf937b0dd4f92cb7470192ddd2eec9ffa7 (patch) | |
| tree | f5627e7fa70c422cde11e043cc68c258b56730ae | |
| parent | b96cfb97ac9b5928673e8f348cb406f46c237d71 (diff) | |
| parent | d48abfc56232fa3e0390c32c507c714caa78a8b1 (diff) | |
| download | base-96d0c0cf937b0dd4f92cb7470192ddd2eec9ffa7.tar.gz | |
Merge cherrypicks of [4315359, 4315389, 4315390, 4315519, 4315520, 4315360, 4317665, 4317701, 4315391, 4316085] into pi-release
Change-Id: I35248f1228a04b847fdb7ecdb15d48190fbaf759
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStack.java | 7 | ||||
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index cc7a2308834e..aea29ac066a3 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -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 diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 3fd69ee5645c..db5f7ed7cc8a 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -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,10 +2711,9 @@ public class AudioService extends IAudioService.Stub synchronized(mSettingsLock) { change = mRingerMode != ringerMode; mRingerMode = ringerMode; + muteRingerModeStreams(); } - muteRingerModeStreams(); - // Post a persist ringer mode msg if (persist) { sendMsg(mAudioHandler, MSG_PERSIST_RINGER_MODE, |