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

Commit 72c66892 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid deadlock when installing app"

parents 34c4cca6 55af6c5f

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

+2 −3
Original line number Diff line number Diff line
@@ -2810,14 +2810,13 @@ public final class ActiveServices { 
    }



    List<ActivityManager.RunningServiceInfo> getRunningServiceInfoLocked(int maxNum, int flags,

        int callingUid, boolean allowed) {

        int callingUid, boolean allowed, boolean canInteractAcrossUsers) {

        ArrayList<ActivityManager.RunningServiceInfo> res

                = new ArrayList<ActivityManager.RunningServiceInfo>();



        final long ident = Binder.clearCallingIdentity();

        try {

            if (ActivityManager.checkUidPermission(INTERACT_ACROSS_USERS_FULL, callingUid)

                == PERMISSION_GRANTED) {

            if (canInteractAcrossUsers) {

                int[] users = mAm.mUserController.getUsers();

                for (int ui=0; ui<users.length && res.size() < maxNum; ui++) {

                    ArrayMap<ComponentName, ServiceRecord> alls = getServicesLocked(users[ui]);

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

+8 −5
Original line number Diff line number Diff line
@@ -17506,12 +17506,15 @@ public class ActivityManagerService extends IActivityManager.Stub 
    public List<ActivityManager.RunningServiceInfo> getServices(int maxNum,

            int flags) {

        enforceNotIsolatedCaller("getServices");

        synchronized (this) {















        final int callingUid = Binder.getCallingUid();













        final boolean canInteractAcrossUsers = (ActivityManager.checkUidPermission(













            INTERACT_ACROSS_USERS_FULL, callingUid) == PERMISSION_GRANTED);















        final boolean allowed = isGetTasksAllowed("getServices", Binder.getCallingPid(),















            callingUid);

























            return mServices.getRunningServiceInfoLocked(maxNum, flags, callingUid, allowed);













        synchronized (this) {













            return mServices.getRunningServiceInfoLocked(maxNum, flags, callingUid,













                allowed, canInteractAcrossUsers);















        }















    }