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

Commit 747b385c 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 

am: 204eb6bf

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

Change-Id: Id51e42d5b4478486bf01e23edb22d2d0a6a1946f
parents 5e648952 204eb6bf

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

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

                continue;

            }

            }




















            try {











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







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











                synchronized (mInstallLock) {







                synchronized (mInstallLock) {











                    reconcileAppsDataLI(volumeUuid, user.id, flags);







                    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) {







        synchronized (mPackages) {