commit c201a89fe9b99389a535d158b8e173989579e79f
author Makoto Onuki <omakoto@google.com> Mon Oct 08 15:19:23 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 08 15:19:23 2018 +0000
tree 58586ab67eae0256d089f3d493338a2669fe5254
parent e2693cb9cae5cbb045e7aafc49755f71b3bc1ecf
parent a107006df73983087012726b342662041a06ac59

Merge "Fix getContentProviderImpl() permission issue"

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 14b5e42..37167c6 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -7552,7 +7552,12 @@
                 // how to test this case.)
                 if (cpr.proc.killed && cpr.proc.killedByAm) {
                     checkTime(startTime, "getContentProviderImpl: before appDied (killedByAm)");
-                    appDiedLocked(cpr.proc);
+                    final long iden = Binder.clearCallingIdentity();
+                    try {
+                        appDiedLocked(cpr.proc);
+                    } finally {
+                        Binder.restoreCallingIdentity(iden);
+                    }
                     checkTime(startTime, "getContentProviderImpl: after appDied (killedByAm)");
                 }
             }