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

Commit ff8b037c authored by Christopher Tate's avatar Christopher Tate
Browse files

am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev 

* commit '777b8a80':
  Adapt to underlying changes in the PBKDF2 implementation

Change-Id: Ia68694a03e52693fceaedc6740dbd8e690e21257
parent 2665f6e9

services/backup/java/com/android/server/backup/BackupManagerService.java

+20 −0
Original line number Diff line number Diff line
@@ -1308,6 +1308,26 @@ public class BackupManagerService extends IBackupManager.Stub { 
            }

        }



        // Snap up to current on the pw file version

        mPasswordVersion = BACKUP_PW_FILE_VERSION;

        FileOutputStream pwFout = null;

        DataOutputStream pwOut = null;

        try {

            pwFout = new FileOutputStream(mPasswordVersionFile);

            pwOut = new DataOutputStream(pwFout);

            pwOut.writeInt(mPasswordVersion);

        } catch (IOException e) {

            Slog.e(TAG, "Unable to write backup pw version; password not changed");

            return false;

        } finally {

            try {

                if (pwOut != null) pwOut.close();

                if (pwFout != null) pwFout.close();

            } catch (IOException e) {

                Slog.w(TAG, "Unable to close pw version record");

            }

        }



        // Clearing the password is okay

        if (newPw == null || newPw.isEmpty()) {

            if (mPasswordHashFile.exists()) {