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

Merge "Mark this coreApp as being encryptionAware."

Browse Source
This commit is contained in:
Jeff Sharkey
2015-11-19 18:45:41 +00:00
committed by Android (Google) Code Review
parent a19090a7df 3bd73edbae
commit a180abf6cf
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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));