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

Merge "Fix race condition triggered by quick stop/start of Dream" into sc-dev am: 9692654a41

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14129971

Change-Id: Iad471cfbfe1751bd5626a675d0ce3be629c9d502
This commit is contained in:
Sean Stout
2021-04-14 14:41:08 +00:00
committed by Automerger Merge Worker
parent 34fc9acd25 9692654a41
commit ec41369714
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/dreams/DreamManagerService.java
View File

@@ -394,7 +394,8 @@ public final class DreamManagerService extends SystemService {
private void startDreamLocked(final ComponentName name,
final boolean isTest, final boolean canDoze, final int userId) {
if (Objects.equals(mCurrentDreamName, name)
if (!mCurrentDreamIsWaking
&& Objects.equals(mCurrentDreamName, name)
&& mCurrentDreamIsTest == isTest
&& mCurrentDreamCanDoze == canDoze
&& mCurrentDreamUserId == userId) {