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

Merge "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" into pi-dev

Browse Source
This commit is contained in:
Rich Cannings
2019-03-28 21:15:33 +00:00
committed by Android (Google) Code Review
parent 157f05eb04 567f2357f9
commit 9bdc35b2df
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,6 @@ import android.database.sqlite.SQLiteOpenHelper;
import android.os.Environment; import android.os.Environment;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.os.storage.StorageManager;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import android.util.Slog; import android.util.Slog;
@@ -49,6 +48,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.RandomAccessFile; import java.io.RandomAccessFile;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -808,7 +808,7 @@ class LockSettingsStorage {
} }
byte[] peekFile(String fileName) { byte[] peekFile(String fileName) {
return (byte[]) peek(CacheKey.TYPE_FILE, fileName, -1 /* userId */); return copyOf((byte[]) peek(CacheKey.TYPE_FILE, fileName, -1 /* userId */));
} }
boolean hasFile(String fileName) { boolean hasFile(String fileName) {
@@ -816,11 +816,11 @@ class LockSettingsStorage {
} }
void putFile(String key, byte[] value) { void putFile(String key, byte[] value) {
put(CacheKey.TYPE_FILE, key, value, -1 /* userId */); put(CacheKey.TYPE_FILE, key, copyOf(value), -1 /* userId */);
} }
void putFileIfUnchanged(String key, byte[] value, int version) { void putFileIfUnchanged(String key, byte[] value, int version) {
putIfUnchanged(CacheKey.TYPE_FILE, key, value, -1 /* userId */, version); putIfUnchanged(CacheKey.TYPE_FILE, key, copyOf(value), -1 /* userId */, version);
} }
void setFetched(int userId) { void setFetched(int userId) {
@@ -868,6 +868,10 @@ class LockSettingsStorage {
mVersion++; mVersion++;
} }
private byte[] copyOf(byte[] data) {
return data != null ? Arrays.copyOf(data, data.length) : null;
}
synchronized void purgePath(String path) { synchronized void purgePath(String path) {
for (int i = mCache.size() - 1; i >= 0; i--) { for (int i = mCache.size() - 1; i >= 0; i--) {
CacheKey entry = mCache.keyAt(i); CacheKey entry = mCache.keyAt(i);