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

Commit 4076bc50 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Fix service binding for singleUser services 

Bug: 7137147

No need to try to retrieve the service again as user 0.

Change-Id: I910aca3fae91dc709ef2265ed0fce09f46f5b769
parent 4be29754

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

+0 −6
Original line number Diff line number Diff line
@@ -478,12 +478,6 @@ public class ActiveServices { 
        if (res.record == null) {

            return -1;

        }

        if (mAm.isSingleton(res.record.processName, res.record.appInfo,

                res.record.serviceInfo.name, res.record.serviceInfo.flags)) {

            userId = 0;

            res = retrieveServiceLocked(service, resolvedType, Binder.getCallingPid(),

                    Binder.getCallingUid(), 0, true);

        }

        ServiceRecord s = res.record;



        final long origId = Binder.clearCallingIdentity();