Handle rename of LruCache.entryEvicted to entryRemoved

Change-Id: I50e5a8d8c35c4431f42c7483172447ba0e4e125b
http://b/3461302

2 files changed, 7 insertions, 4 deletions

diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java
index 2e43eef3c770..90a5b5de8c09 100644
--- a/core/java/android/database/sqlite/SQLiteDatabase.java
+++ b/core/java/android/database/sqlite/SQLiteDatabase.java
@@ -2218,9 +2218,10 @@ public class SQLiteDatabase extends SQLiteClosable {
             }
             mCompiledQueries = new LruCache<String, SQLiteCompiledSql>(cacheSize) {
                 @Override
-                protected void entryEvicted(String key, SQLiteCompiledSql value) {
+                protected void entryRemoved(boolean evicted, String key, SQLiteCompiledSql oldValue,
+                        SQLiteCompiledSql newValue) {
                     verifyLockOwner();
-                    value.releaseIfNotInUse();
+                    oldValue.releaseIfNotInUse();
                 }
             };
             if (oldCompiledQueries != null) {
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 9017ca3a831a..95fd62d1e6e2 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -748,8 +748,10 @@ public class SettingsProvider extends ContentProvider {
         }
 
         @Override
-        protected synchronized void entryEvicted(String key, Bundle value) {
-            mCacheFullyMatchesDisk = false;
+        protected void entryRemoved(boolean evicted, String key, Bundle oldValue, Bundle newValue) {
+            if (evicted) {
+                mCacheFullyMatchesDisk = false;
+            }
         }
 
         /**