Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 204eb6bf authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Avoid restart when inserting/ejecting adopted." into nyc-dev 

am: c8cc38c8

* commit 'c8cc38c8':
  Avoid restart when inserting/ejecting adopted.

Change-Id: I941527f23a1a4f26fd198d3423f7ec18013a56d1
parents 156ef4a7 c8cc38c8

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

+8 −3
Original line number Diff line number Diff line
@@ -18847,10 +18847,15 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); 
                continue;

            }













            try {















                sm.prepareUserStorage(volumeUuid, user.id, user.serialNumber, flags);















                synchronized (mInstallLock) {















                    reconcileAppsDataLI(volumeUuid, user.id, flags);















                }













            } catch (IllegalStateException e) {













                // Device was probably ejected, and we'll process that event momentarily













                Slog.w(TAG, "Failed to prepare storage: " + e);













            }















        }





























        synchronized (mPackages) {