diff options
-rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 06e27fc..ef833cb 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -866,7 +866,7 @@ public class PackageManagerService extends IPackageManager.Stub { public void onServiceDisconnected(ComponentName name) { if (DEBUG_SD_INSTALL) Log.i(TAG, "onServiceDisconnected"); } - }; + } // Recordkeeping of restore-after-install operations that are currently in flight // between the Package Manager and the Backup Manager @@ -878,7 +878,8 @@ public class PackageManagerService extends IPackageManager.Stub { args = _a; res = _r; } - }; + } + final SparseArray<PostInstallData> mRunningInstalls = new SparseArray<PostInstallData>(); int mNextInstallToken = 1; // nonzero; will be wrapped back to 1 when ++ overflows @@ -1104,13 +1105,18 @@ public class PackageManagerService extends IPackageManager.Stub { mContainerService = (IMediaContainerService) msg.obj; } if (mContainerService == null) { - // Something seriously wrong. Bail out - Slog.e(TAG, "Cannot bind to media container service"); - for (HandlerParams params : mPendingInstalls) { - // Indicate service bind error - params.serviceError(); + if (!mBound) { + // Something seriously wrong since we are not bound and we are not + // waiting for connection. Bail out. + Slog.e(TAG, "Cannot bind to media container service"); + for (HandlerParams params : mPendingInstalls) { + // Indicate service bind error + params.serviceError(); + } + mPendingInstalls.clear(); + } else { + Slog.w(TAG, "Waiting to connect to media container service"); } - mPendingInstalls.clear(); } else if (mPendingInstalls.size() > 0) { HandlerParams params = mPendingInstalls.get(0); if (params != null) { |