Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d30bbfa7 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "Fix issue #64140901: Maps crashed entering PIP right after..." into oc-mr1-dev 

am: bd3d2900

Change-Id: I2f2f6d3c6177f1324421643e01e9bd6cf20b6d75
parents 5f935d47 bd3d2900

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -23879,8 +23879,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
                Slog.w(TAG, "markAsSentFromNotification(): not a PendingIntentRecord: " + target);

                return;

            }

            synchronized (ActivityManagerService.this) {

                ((PendingIntentRecord) target).setWhitelistDurationLocked(whitelistToken, duration);

            }

        }















        @Override















        public void setDeviceIdleWhitelist(int[] appids) {