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

Commit 5da9f2a6 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Merge "Don't bring up backup agents in secondary app processes" into oc-dev 

am: 67db70ad

Change-Id: I4a82af26fa61f25f254ae6f4441160ac6cc4a873
parents 16998982 67db70ad

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

+1 −1
Original line number Diff line number Diff line
@@ -6945,7 +6945,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
        }















        // Check whether the next backup agent is in this process...













        if (!badApp && mBackupTarget != null && mBackupTarget.appInfo.uid == app.uid) {













        if (!badApp && mBackupTarget != null && mBackupTarget.app == app) {















            if (DEBUG_BACKUP) Slog.v(TAG_BACKUP,















                    "New app is backup target, launching agent for " + app);















            notifyPackageUse(mBackupTarget.appInfo.packageName,