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

Commit ce482efc 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

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

Change-Id: I9c547380f109ed2a9a2e0505691630d9b8471f96
parents 818ed108 adfa806c

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

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

        try {

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

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

















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







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











                UserManagerService.enforceSerialNumber(







                UserManagerService.enforceSerialNumber(











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







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











            }







            }











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







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











                UserManagerService.enforceSerialNumber(







                UserManagerService.enforceSerialNumber(











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







                        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







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











                        + " because no matching user was found");







                        + " because no matching user was found");











                destroyUser = true;







                destroyUser = true;











            } else {







            } else if (!mOnlyCore) {











                try {







                try {











                    UserManagerService.enforceSerialNumber(file, info.serialNumber);







                    UserManagerService.enforceSerialNumber(file, info.serialNumber);











                } catch (IOException e) {







                } catch (IOException e) {