From 3326c526bc84a1529613b5333502c2dcb64d966d Mon Sep 17 00:00:00 2001 From: Xiaohui Chen Date: Thu, 6 Aug 2015 16:27:44 -0700 Subject: [PATCH] Clean up USER_OWNER in ServiceWatcher Bug: 19913735 Change-Id: I1d9fe26efe7ec2abb6b164efb0af04416cc0f7fb --- services/core/java/com/android/server/ServiceWatcher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/ServiceWatcher.java b/services/core/java/com/android/server/ServiceWatcher.java index 927429506d3d1..60621374baadb 100644 --- a/services/core/java/com/android/server/ServiceWatcher.java +++ b/services/core/java/com/android/server/ServiceWatcher.java @@ -165,7 +165,7 @@ public class ServiceWatcher implements ServiceConnection { intent.setPackage(justCheckThisPackage); } List 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,