commit 5efc533be6ac43df56a05c84972affbd07a913a7
author Amith Yamasani <yamasani@google.com> Wed Sep 12 18:25:19 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 12 18:25:20 2012 -0700
tree 79c26bb7bc7e8badacdc4d90ad0366aedc595ea2
parent 43229d707515ce51c52f63e15257960c6d29162c
parent 4076bc504614ab192186ab58bc346012c53a8330

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

services/java/com/android/server/am/ActiveServices.java

diff --git a/services/java/com/android/server/am/ActiveServices.java b/services/java/com/android/server/am/ActiveServices.java
index 3bb95a8..aefc264 100644
--- a/services/java/com/android/server/am/ActiveServices.java
+++ b/services/java/com/android/server/am/ActiveServices.java
@@ -478,12 +478,6 @@
         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();