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: I000cad39f0c2cf41cadaff3499dba4776326b5f5
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 15d31c7..bd6f585 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -135,18 +135,21 @@
<uses-permission android:name="android.permission.STOP_APP_SWITCHES" />
<application android:name="PhoneApp"
- android:persistent="true"
- android:label="@string/phoneAppLabel"
- android:icon="@mipmap/ic_launcher_phone"
- android:allowBackup="false"
- android:supportsRtl="true"
- android:usesCleartextTraffic="true">
- <provider android:name="IccProvider"
- android:authorities="icc"
- android:multiprocess="true"
- android:exported="true"
- android:readPermission="android.permission.READ_CONTACTS"
- android:writePermission="android.permission.WRITE_CONTACTS" />
+ android:persistent="true"
+ android:label="@string/phoneAppLabel"
+ android:icon="@mipmap/ic_launcher_phone"
+ android:allowBackup="false"
+ android:supportsRtl="true"
+ android:usesCleartextTraffic="true"
+ android:forceDeviceEncrypted="true"
+ android:encryptionAware="true">
+
+ <provider android:name="IccProvider"
+ android:authorities="icc"
+ android:multiprocess="true"
+ android:exported="true"
+ android:readPermission="android.permission.READ_CONTACTS"
+ android:writePermission="android.permission.WRITE_CONTACTS" />
<!-- Dialer UI that only allows emergency calls -->
<activity android:name="EmergencyDialer"