diff options
| author | Dianne Hackborn <hackbod@google.com> | 2017-07-31 13:56:02 -0700 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-17 06:09:58 +0000 |
| commit | b274d9706946e9f60337fbd0a3d4bc3f540859e8 (patch) | |
| tree | 9381c0c17fe959f0692f31116b0370671343b092 | |
| parent | 395c999259cad26ba706d13c1c500fe32a9e9265 (diff) | |
| download | base-b274d9706946e9f60337fbd0a3d4bc3f540859e8.tar.gz | |
Maps crashed entering PIP right after...
...beginning navigation
Bug: 64140901
Test: booted and ran and posted notifications.
Merged-In:I8c9173dab2716b901cc6dd66f0b0d18cae33f298
Change-Id: I8c9173dab2716b901cc6dd66f0b0d18cae33f298
(cherry picked from commit 52195a66311d79a2f57e8112db86d48ed15bf915)
(cherry picked from commit 598c497be3c6a9ac4bcb1f574adda336e88c9428)
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 84017e7beb58..99c0e4f71d19 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -23917,7 +23917,9 @@ public class ActivityManagerService extends IActivityManager.Stub Slog.w(TAG, "markAsSentFromNotification(): not a PendingIntentRecord: " + target); return; } - ((PendingIntentRecord) target).setWhitelistDurationLocked(whitelistToken, duration); + synchronized (ActivityManagerService.this) { + ((PendingIntentRecord) target).setWhitelistDurationLocked(whitelistToken, duration); + } } @Override |