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

Stop trying to update FDE password from LockSettingsService am: d63d0e12cc

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

Change-Id: I29fac5270397e41b91df1d4e06337880ff8f91f6
This commit is contained in:
Eric Biggers
2022-03-10 00:55:43 +00:00
committed by Automerger Merge Worker
parent a8daebb9d0 d63d0e12cc
commit 426b3da0d1
2 changed files with 4 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/com/android/internal/widget/ILockSettings.aidl
View File

@@ -95,5 +95,4 @@ interface ILockSettings {
boolean hasSecureLockScreen();
boolean tryUnlockWithCachedUnifiedChallenge(int userId);
void removeCachedUnifiedChallenge(int userId);
void updateEncryptionPassword(int type, in byte[] password);
}

53
services/core/java/com/android/server/locksettings/LockSettingsService.java
View File

@@ -1761,7 +1761,10 @@ public class LockSettingsService extends ILockSettings.Stub {
}
private void onPostPasswordChanged(LockscreenCredential newCredential, int userHandle) {
updateEncryptionPasswordIfNeeded(newCredential, userHandle);
if (userHandle == UserHandle.USER_SYSTEM && isDeviceEncryptionEnabled() &&
shouldEncryptWithCredentials() && newCredential.isNone()) {
setCredentialRequiredToDecrypt(false);
}
if (newCredential.isPattern()) {
setBoolean(LockPatternUtils.PATTERN_EVER_CHOSEN_KEY, true, userHandle);
}
@@ -1769,26 +1772,6 @@ public class LockSettingsService extends ILockSettings.Stub {
mContext.getSystemService(TrustManager.class).reportEnabledTrustAgentsChanged(userHandle);
}
/**
* Update device encryption password if calling user is USER_SYSTEM and device supports
* encryption.
*/
private void updateEncryptionPasswordIfNeeded(LockscreenCredential credential, int userHandle) {
// Update the device encryption password.
if (userHandle != UserHandle.USER_SYSTEM || !isDeviceEncryptionEnabled()) {
return;
}
if (!shouldEncryptWithCredentials()) {
updateEncryptionPassword(StorageManager.CRYPT_TYPE_DEFAULT, null);
return;
}
if (credential.isNone()) {
// Set the encryption password to default.
setCredentialRequiredToDecrypt(false);
}
updateEncryptionPassword(credential.getStorageCryptType(), credential.getCredential());
}
/**
* Store the hash of the *current* password in the password history list, if device policy
* enforces password history requirement.
@@ -1883,34 +1866,6 @@ public class LockSettingsService extends ILockSettings.Stub {
}
}
/** Update the encryption password if it is enabled **/
@Override
public void updateEncryptionPassword(final int type, final byte[] password) {
if (!hasSecureLockScreen() && password != null && password.length != 0) {
throw new UnsupportedOperationException(
"This operation requires the lock screen feature.");
}
if (!isDeviceEncryptionEnabled()) {
return;
}
final IBinder service = ServiceManager.getService("mount");
if (service == null) {
Slog.e(TAG, "Could not find the mount service to update the encryption password");
return;
}
// TODO(b/120484642): This is a location where we still use a String for vold
String passwordString = password != null ? new String(password) : null;
mHandler.post(() -> {
IStorageManager storageManager = mInjector.getStorageManager();
try {
storageManager.changeEncryptionPassword(type, passwordString);
} catch (RemoteException e) {
Slog.e(TAG, "Error changing encryption password", e);
}
});
}
@VisibleForTesting /** Note: this method is overridden in unit tests */
protected void tieProfileLockToParent(int userId, LockscreenCredential password) {
if (DEBUG) Slog.v(TAG, "tieProfileLockToParent for user: " + userId);