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

Commit 22bf2a6e authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

Merge "Fix full backup/restore detection of encrypted devices"

parents c6afc7a7 a23b3432

packages/BackupRestoreConfirmation/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    package="com.android.backupconfirm" >



    <uses-permission android:name="android.permission.BACKUP" />

    <uses-permission android:name="android.permission.CRYPT_KEEPER" />



    <application android:allowClearUserData="false"

                 android:allowBackup="false"

packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ public class BackupRestoreConfirmation extends Activity { 
        } catch (Exception e) {

            // If we can't talk to the mount service we have a serious problem; fail

            // "secure" i.e. assuming that the device is encrypted.

            Slog.e(TAG, "Unable to communicate with mount service: " + e.getMessage());

            return true;

        }

    }