am 5efc533b: Merge "Fix service binding for singleUser services" into jb-mr1-dev

* commit '5efc533be6ac43df56a05c84972affbd07a913a7':
  Fix service binding for singleUser services
This commit is contained in:
Amith Yamasani
2012-09-12 18:27:25 -07:00
committed by Android Git Automerger

View File

@@ -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();