PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark this coreApp as being encryptionAware.

Browse Source 
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
This commit is contained in:
Jeff Sharkey
2015-11-18 10:20:18 -07:00
parent 1c212aa92c
commit 3bd73edbae
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -92,7 +92,9 @@
android:requiredForAllUsers="true" android:requiredForAllUsers="true"
android:supportsRtl="true" android:supportsRtl="true"
android:allowBackup="false" android:allowBackup="false"
android:usesCleartextTraffic="true"> android:usesCleartextTraffic="true"
android:forceDeviceEncrypted="true"
android:encryptionAware="true">
<!-- Settings --> <!-- Settings -->

3
src/com/android/settings/DevelopmentSettings.java
View File

@@ -54,6 +54,7 @@ import android.os.StrictMode;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserManager; import android.os.UserManager;
import android.os.storage.IMountService; import android.os.storage.IMountService;
import android.os.storage.StorageManager;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
import android.provider.Settings; import android.provider.Settings;
import android.provider.Settings.Global; import android.provider.Settings.Global;
@@ -421,7 +422,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
IMountService mountService = IMountService.Stub.asInterface(service); IMountService mountService = IMountService.Stub.asInterface(service);
if (!mountService.isConvertibleToFBE()) { if (!mountService.isConvertibleToFBE()) {
removePreference(KEY_CONVERT_FBE); removePreference(KEY_CONVERT_FBE);
} else if (mountService.isPerUserEncryptionEnabled()) { } else if ("file".equals(SystemProperties.get("ro.crypto.type", "none"))) {
convertFbePreference.setEnabled(false); convertFbePreference.setEnabled(false);
convertFbePreference.setSummary(getResources() convertFbePreference.setSummary(getResources()
.getString(R.string.convert_to_file_encryption_done)); .getString(R.string.convert_to_file_encryption_done));