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

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

Merge \\"Ignore serial number checks when emulating FBE.\\" into nyc-mr1-dev am: 12f6687b

am: f00768d3

Change-Id: I0ddf0ac52f93964050dd7c72ea1737e92695dfb9
parents 57e845b5 f00768d3
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -2961,6 +2961,14 @@ public class UserManagerService extends IUserManager.Stub {
     *             number is mismatched.
     */
    public static void enforceSerialNumber(File file, int serialNumber) throws IOException {
        if (StorageManager.isFileEncryptedEmulatedOnly()) {
            // When we're emulating FBE, the directory may have been chmod
            // 000'ed, meaning we can't read the serial number to enforce it;
            // instead of destroying the user, just log a warning.
            Slog.w(LOG_TAG, "Device is emulating FBE; assuming current serial number is valid");
            return;
        }

        final int foundSerial = getSerialNumber(file);
        Slog.v(LOG_TAG, "Found " + file + " with serial number " + foundSerial);