Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up USER_OWNER in ServiceWatcher"

Browse Source
This commit is contained in:
Xiaohui Chen
2015-08-12 17:46:03 +00:00
committed by Android (Google) Code Review
parent 7d3cc62df8 3326c526bc
commit c91edfafac
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/ServiceWatcher.java
View File

@@ -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,