Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove support for converting from FDE to FBE" am: 855ec2d31a am: 6a72370d4b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2027583

Change-Id: I07ed4132c24152febfa4c2ae323594452953f043
This commit is contained in:
Eric Biggers
2022-03-17 22:42:57 +00:00
committed by Automerger Merge Worker
parent 8a915e5042 6a72370d4b
commit 071a3b1820
4 changed files with 4 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/os/storage/IStorageManager.aidl
View File

@@ -125,7 +125,6 @@ interface IStorageManager {
boolean isUserKeyUnlocked(int userId) = 65;
void prepareUserStorage(in String volumeUuid, int userId, int serialNumber, int flags) = 66;
void destroyUserStorage(in String volumeUuid, int userId, int flags) = 67;
boolean isConvertibleToFBE() = 68;
void addUserKeyAuth(int userId, int serialNumber, in byte[] secret) = 70;
void fixateNewestUserKeyAuth(int userId) = 71;
void fstrim(int flags, IVoldTaskListener listener) = 72;

17
packages/SettingsLib/res/values/strings.xml
View File

@@ -1038,23 +1038,6 @@
<!-- Developer settings: text for the WebView provider selection toast shown if an invalid provider was chosen (i.e. the setting list was stale). [CHAR LIMIT=NONE] -->
<string name="select_webview_provider_toast_text">This choice is no longer valid. Try again.</string>
<!-- Developer settings screen, convert userdata to file encryption option name -->
<string name="convert_to_file_encryption">Convert to file encryption</string>
<!-- Developer settings screen, convert userdata to file encryption summary when option is available -->
<string name="convert_to_file_encryption_enabled">Convert\u2026</string>
<!-- Developer settings screen, convert userdata to file encryption summary when option is already done -->
<string name="convert_to_file_encryption_done">Already file encrypted</string>
<!-- Title used on dialog with final prompt for converting to file encryption -->
<string name="title_convert_fbe">Converting to file based encryption</string>
<!-- Warning displayed on dialog with final prompt for converting to file encryption -->
<string name="convert_to_fbe_warning">
Convert data partition to file based encryption.\n
!!Warning!! This will erase all your data.\n
This feature is alpha, and may not work correctly.\n
Press \'Wipe and convert\u2026\' to continue.</string>
<!-- Button on dialog that triggers convertion to file encryption -->
<string name="button_convert_fbe">Wipe and convert\u2026</string>
<!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
<string name="picture_color_mode">Picture color mode</string>

6
proto/src/metrics_constants/metrics_constants.proto
View File

@@ -2260,10 +2260,12 @@ message MetricsEvent {
ACCOUNTS_WORK_PROFILE_SETTINGS = 401;
// Settings -> Dev options -> Convert to file encryption
CONVERT_FBE = 402;
// DEPRECATED: this setting was removed in Android T.
CONVERT_FBE = 402 [deprecated=true];
// Settings -> Dev options -> Convert to file encryption -> WIPE AND CONVERT...
CONVERT_FBE_CONFIRM = 403;
// DEPRECATED: this setting was removed in Android T.
CONVERT_FBE_CONFIRM = 403 [deprecated=true];
// Settings -> Dev options -> Running services
RUNNING_SERVICES = 404;

17
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -3071,23 +3071,6 @@ class StorageManagerService extends IStorageManager.Stub
}
}
/**
* Is userdata convertible to file based encryption?
* @return non zero for convertible
*/
@Override
public boolean isConvertibleToFBE() throws RemoteException {
mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER,
"no permission to access the crypt keeper");
try {
return mVold.isConvertibleToFbe();
} catch (Exception e) {
Slog.wtf(TAG, e);
return false;
}
}
/**
* Check whether the device supports filesystem checkpointing.
*