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

Merge "Stop invoking secdiscard when deleting password data" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-06 22:37:43 +00:00
committed by Android (Google) Code Review
parent 9015d24332 841fd43338
commit 8fa420c261
4 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,7 +185,6 @@ interface IStorageManager {
long getCacheSizeBytes(String volumeUuid, int uid) = 76;
long getAllocatableBytes(String volumeUuid, int flags, String callingPackage) = 77;
void allocateBytes(String volumeUuid, long bytes, int flags, String callingPackage) = 78;
void secdiscard(in String path) = 79;
void runIdleMaintenance() = 80;
void abortIdleMaintenance() = 81;
void runIdleMaintenance() = 79;
void abortIdleMaintenance() = 80;
}

10
core/java/android/os/storage/StorageManager.java
View File

@@ -50,7 +50,6 @@ import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.ServiceManager.ServiceNotFoundException;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings;
import android.system.ErrnoException;
import android.system.Os;
@@ -1322,15 +1321,6 @@ public class StorageManager {
}
}
/** {@hide} */
public void secdiscard(String path) {
try {
mStorageManager.secdiscard(path);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/** {@hide} */
public static boolean isUserKeyUnlocked(int userId) {
if (sStorageManager == null) {

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

@@ -2583,17 +2583,6 @@ class StorageManagerService extends IStorageManager.Stub
}
}
@Override
public void secdiscard(String path) {
enforcePermission(android.Manifest.permission.STORAGE_INTERNAL);
try {
mVold.secdiscard(path);
} catch (Exception e) {
Slog.wtf(TAG, e);
}
}
class AppFuseMountScope extends AppFuseBridge.MountScope {
boolean opened = false;

7
services/core/java/com/android/server/locksettings/LockSettingsStorage.java
View File

@@ -495,10 +495,11 @@ class LockSettingsStorage {
String path = getSynthenticPasswordStateFilePathForUser(userId, handle, name);
File file = new File(path);
if (file.exists()) {
try {
mContext.getSystemService(StorageManager.class).secdiscard(file.getAbsolutePath());
try (RandomAccessFile raf = new RandomAccessFile(path, "rws")) {
final int fileSize = (int) raf.length();
raf.write(new byte[fileSize]);
} catch (Exception e) {
Slog.w(TAG, "Failed to secdiscard " + path, e);
Slog.w(TAG, "Failed to zeroize " + path, e);
} finally {
file.delete();
}