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

Commit c91edfaf authored by Xiaohui Chen's avatar Xiaohui Chen Committed by Android (Google) Code Review
Browse files

Merge "Clean up USER_OWNER in ServiceWatcher"

parents 7d3cc62d 3326c526

services/core/java/com/android/server/ServiceWatcher.java

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ public class ServiceWatcher implements ServiceConnection { 
            intent.setPackage(justCheckThisPackage);

        }

        List<ResolveInfo> rInfos = mPm.queryIntentServicesAsUser(intent,

                PackageManager.GET_META_DATA, UserHandle.USER_OWNER);

                PackageManager.GET_META_DATA, UserHandle.USER_SYSTEM);

        int bestVersion = Integer.MIN_VALUE;

        String bestPackage = null;

        boolean bestIsMultiuser = false;
@@ -242,7 +242,7 @@ public class ServiceWatcher implements ServiceConnection { 
        if (D) Log.d(mTag, "binding " + packageName + " (version " + version + ") ("

                + (isMultiuser ? "multi" : "single") + "-user)");

        mContext.bindServiceAsUser(intent, this, Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND

                | Context.BIND_NOT_VISIBLE, mIsMultiuser ? UserHandle.OWNER : UserHandle.CURRENT);

                | Context.BIND_NOT_VISIBLE, mIsMultiuser ? UserHandle.SYSTEM : UserHandle.CURRENT);

    }



    public static boolean isSignatureMatch(Signature[] signatures,