Merge "Fix adb install" into jb-mr1-dev

Author: Amith Yamasani

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

@@ -729,7 +729,7 @@ private ServiceLookupResult retrieveServiceLocked(Intent service,
                 ServiceInfo sInfo =
                     rInfo != null ? rInfo.serviceInfo : null;
                 if (sInfo == null) {
-                    Slog.w(TAG, "Unable to start service " + service +
+                    Slog.w(TAG, "Unable to start service " + service + " U=" + userId +
                           ": not found");
                     return null;
                 }

services/java/com/android/server/pm/PackageManagerService.java

@@ -473,6 +473,9 @@ private boolean connectToService() {
             mContainerServiceUserId = 0;
             if (mPendingInstalls.size() > 0) {
                 mContainerServiceUserId = mPendingInstalls.get(0).getUser().getIdentifier();
+                if (mContainerServiceUserId == UserHandle.USER_ALL) {
+                    mContainerServiceUserId = 0;
+                }
             }
             if (mContext.bindService(service, mDefContainerConn,
                     Context.BIND_AUTO_CREATE, mContainerServiceUserId)) {
@@ -554,7 +557,10 @@ void doHandleMessage(Message msg) {
                         if (params != null) {
                             // Check if we're connected to the correct service, if it's an install
                             // request.
-                            if (params.getUser().getIdentifier() != mContainerServiceUserId) {
+                            final int installFor = params.getUser().getIdentifier();
+                            if (installFor != mContainerServiceUserId
+                                    && (installFor == UserHandle.USER_ALL
+                                            && mContainerServiceUserId != 0)) {
                                 mHandler.sendEmptyMessage(MCS_RECONNECT);
                                 return;
                             }