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

Commit 79062d79 authored by Varun Shah's avatar Varun Shah Committed by Sterling Huber
Browse files

RESTRICT AUTOMERGE 

Ensure caller identity is restored in CP quick-path.

Bug: 172935267
Test: PoC in bug
Change-Id: I469bde7d0a0f89c94f1234cf40983395048962e2
parent f312c9e8

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

+57 −56
Original line number Diff line number Diff line
@@ -11543,11 +11543,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
                }















                final long origId = Binder.clearCallingIdentity();

























                try {















                    checkTime(startTime, "getContentProviderImpl: incProviderCountLocked");



























                // In this case the provider instance already exists, so we can













                // return it right away.













                    // Return the provider instance right away since it already exists.















                    conn = incProviderCountLocked(r, cpr, token, stable);















                    if (conn != null && (conn.stableCount+conn.unstableCount) == 1) {















                        if (cpr.proc != null && r.setAdj <= ProcessList.PERCEPTIBLE_APP_ADJ) {









@@ -11569,7 +11568,8 @@ public class ActivityManagerService extends IActivityManager.Stub













                    // it, we will check whether the process still exists.  Note that this doesn't















                    // completely get rid of races with LMK killing the process, but should make















                    // them much smaller.













                if (success && verifiedAdj != cpr.proc.setAdj && !isProcessAliveLocked(cpr.proc)) {













                    if (success && verifiedAdj != cpr.proc.setAdj













                            && !isProcessAliveLocked(cpr.proc)) {















                        success = false;















                    }















                    maybeUpdateProviderUsageStatsLocked(r, cpr.info.packageName, name);










@@ -11600,9 +11600,10 @@ public class ActivityManagerService extends IActivityManager.Stub













                    } else {















                        cpr.proc.verifiedAdj = cpr.proc.setAdj;















                    }

























                } finally {















                    Binder.restoreCallingIdentity(origId);















                }













            }





























            if (!providerRunning) {















                try {