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

Commit 28921fe6 authored by Varun Shah's avatar Varun Shah Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE am: e0553842 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13093516

Change-Id: I614c15f08f8224f1cdf41719485db9b74639e9f9
parents 7306f907 e0553842

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

+59 −58
Original line number Diff line number Diff line
@@ -6811,13 +6811,12 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        "getContentProviderImpl: after checkContentProviderPermission");















                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.













                conn = incProviderCountLocked(r, cpr, token, callingUid, callingPackage, callingTag,













                        stable);













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













                    conn = incProviderCountLocked(r, cpr, token, callingUid, callingPackage,













                            callingTag, stable);















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















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















                            // If this is a perceptible app accessing the provider,









@@ -6839,7 +6838,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);










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













                    } else {















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















                    }

























                } finally {















                    Binder.restoreCallingIdentity(origId);















                }













            }





























            if (!providerRunning) {















                try {