Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cb88f8e authored by Ahming Chen's avatar Ahming Chen Committed by android-build-team Robot
Browse files

Revert "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" 

This reverts commit 567f2357.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I0bc0183de916f29f79d0cee053043cf6c323f167
(cherry picked from commit bae09a535892453bf72741b0cd60e6502814f469)
parent e87069a0

services/core/java/com/android/server/locksettings/LockSettingsStorage.java

+4 −8
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.database.sqlite.SQLiteOpenHelper; 
import android.os.Environment;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.storage.StorageManager;

import android.util.ArrayMap;

import android.util.Log;

import android.util.Slog;
@@ -48,7 +49,6 @@ import java.io.File; 
import java.io.IOException;

import java.io.RandomAccessFile;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.Map;
@@ -808,7 +808,7 @@ class LockSettingsStorage { 
        }



        byte[] peekFile(String fileName) {

            return copyOf((byte[]) peek(CacheKey.TYPE_FILE, fileName, -1 /* userId */));

            return (byte[]) peek(CacheKey.TYPE_FILE, fileName, -1 /* userId */);

        }



        boolean hasFile(String fileName) {
@@ -816,11 +816,11 @@ class LockSettingsStorage { 
        }



        void putFile(String key, byte[] value) {

            put(CacheKey.TYPE_FILE, key, copyOf(value), -1 /* userId */);

            put(CacheKey.TYPE_FILE, key, value, -1 /* userId */);

        }



        void putFileIfUnchanged(String key, byte[] value, int version) {

            putIfUnchanged(CacheKey.TYPE_FILE, key, copyOf(value), -1 /* userId */, version);

            putIfUnchanged(CacheKey.TYPE_FILE, key, value, -1 /* userId */, version);

        }



        void setFetched(int userId) {
@@ -868,10 +868,6 @@ class LockSettingsStorage { 
            mVersion++;

        }



        private byte[] copyOf(byte[] data) {

            return data != null ? Arrays.copyOf(data, data.length) : null;

        }



        synchronized void purgePath(String path) {

            for (int i = mCache.size() - 1; i >= 0; i--) {

                CacheKey entry = mCache.keyAt(i);