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

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

Fix full backup/restore detection of encrypted devices 

The confirmation UI did not request the needed permission, so was failing
to communicate with the mount service; as a "safe" failure mode, it was
assuming the device was encrypted.  Fixed; now it presents the correct
prompt text for the device's encryption state.

Bug 5958195

Change-Id: Ic03db16673b89d3377e0362a09cf51bfb572d78b
parent 9492947a

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;

        }

    }