From 598c497be3c6a9ac4bcb1f574adda336e88c9428 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Mon, 31 Jul 2017 13:56:02 -0700 Subject: [PATCH] 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) --- 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 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 -- 2.11.0