From 52195a66311d79a2f57e8112db86d48ed15bf915 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Mon, 31 Jul 2017 13:56:02 -0700 Subject: Fix issue #64140901: Maps crashed entering PIP right after... ...beginning navigation Test: booted and ran and posted notifications. Change-Id: I8c9173dab2716b901cc6dd66f0b0d18cae33f298 --- services/core/java/com/android/server/am/ActivityManagerService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index f6c56ed44f8f..b489a3629505 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -23879,7 +23879,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 -- cgit v1.2.3-59-g8ed1b