diff options
| author | 2012-08-27 12:24:24 -0700 | |
|---|---|---|
| committer | 2012-08-27 12:24:24 -0700 | |
| commit | a84a4af9b11946fe16689cd42741a92ca285ffe9 (patch) | |
| tree | b7c24079b57d84fc0f77085edf1f9d364bcc0804 /services/java/com | |
| parent | 63dc027be28762232335797a30449995c555ae10 (diff) | |
| parent | 2b9146523347d4458d17d99824afdac29e312176 (diff) | |
Merge "Fix adb install" into jb-mr1-dev
Diffstat (limited to 'services/java/com')
| -rw-r--r-- | services/java/com/android/server/am/ActiveServices.java | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/pm/PackageManagerService.java | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/services/java/com/android/server/am/ActiveServices.java b/services/java/com/android/server/am/ActiveServices.java index e6bcaa1d92df..ca7faa2de622 100644 --- a/services/java/com/android/server/am/ActiveServices.java +++ b/services/java/com/android/server/am/ActiveServices.java @@ -729,7 +729,7 @@ public class ActiveServices { 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; } diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 0345df100b37..ba8533fed3a6 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -473,6 +473,9 @@ public class PackageManagerService extends IPackageManager.Stub { 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 @@ public class PackageManagerService extends IPackageManager.Stub { 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; } |