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

Commit 99034ec2 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Ignore user serial numbers in core-only mode." into nyc-dev am: adfa806c 

am: ce482efc

* commit 'ce482efc':
  Ignore user serial numbers in core-only mode.

Change-Id: I61c13d93e5b908a358134a900de82c20c1b83876
parents 3a46c128 ce482efc

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

+3 −3
Original line number Diff line number Diff line
@@ -18688,11 +18688,11 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); 
        try {

            storage.prepareUserStorage(volumeUuid, userId, userSerial, flags);













            if ((flags & StorageManager.FLAG_STORAGE_DE) != 0) {













            if ((flags & StorageManager.FLAG_STORAGE_DE) != 0 && !mOnlyCore) {















                UserManagerService.enforceSerialNumber(















                        Environment.getDataUserDeDirectory(volumeUuid, userId), userSerial);















            }













            if ((flags & StorageManager.FLAG_STORAGE_CE) != 0) {













            if ((flags & StorageManager.FLAG_STORAGE_CE) != 0 && !mOnlyCore) {















                UserManagerService.enforceSerialNumber(















                        Environment.getDataUserCeDirectory(volumeUuid, userId), userSerial);















            }










@@ -18780,7 +18780,7 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());













                logCriticalInfo(Log.WARN, "Destroying user directory " + file















                        + " because no matching user was found");















                destroyUser = true;













            } else {













            } else if (!mOnlyCore) {















                try {















                    UserManagerService.enforceSerialNumber(file, info.serialNumber);















                } catch (IOException e) {