Merge "Fix service binding for singleUser services" into jb-mr1-dev

This commit is contained in:
Amith Yamasani
2012-09-12 18:25:19 -07:00
committed by Android (Google) Code Review

View File

@@ -478,12 +478,6 @@ public class ActiveServices {
if (res.record == null) { if (res.record == null) {
return -1; 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; ServiceRecord s = res.record;
final long origId = Binder.clearCallingIdentity(); final long origId = Binder.clearCallingIdentity();