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

Commit 3bd73edb authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Mark this coreApp as being encryptionAware. 

Historically, apps marked with "coreApp" were prepared to run in a
limited boot environment, and were critical to booting the device, so
in the new file-based encryption world we're marking these apps with
both "forceDeviceEncrypted" and "encryptionAware" attributes.

Bug: 22358539
Change-Id: Idf9fb8d4b0cc1cd504c9ab7ed770d2cd86d3d506
parent 1c212aa9

AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -92,7 +92,9 @@ 
            android:requiredForAllUsers="true"

            android:supportsRtl="true"

            android:allowBackup="false"

            android:usesCleartextTraffic="true">

            android:usesCleartextTraffic="true"

            android:forceDeviceEncrypted="true"

            android:encryptionAware="true">



        <!-- Settings -->

src/com/android/settings/DevelopmentSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import android.os.StrictMode; 
import android.os.SystemProperties;

import android.os.UserManager;

import android.os.storage.IMountService;

import android.os.storage.StorageManager;

import android.provider.SearchIndexableResource;

import android.provider.Settings;

import android.provider.Settings.Global;
@@ -421,7 +422,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
            IMountService mountService = IMountService.Stub.asInterface(service);

            if (!mountService.isConvertibleToFBE()) {

                removePreference(KEY_CONVERT_FBE);

            } else if (mountService.isPerUserEncryptionEnabled()) {

            } else if ("file".equals(SystemProperties.get("ro.crypto.type", "none"))) {

                convertFbePreference.setEnabled(false);

                convertFbePreference.setSummary(getResources()

                                   .getString(R.string.convert_to_file_encryption_done));