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

Commit 32c80a27 authored by Jesse Wilson's avatar Jesse Wilson
Browse files

Handle rename of LruCache.entryEvicted to entryRemoved 

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

core/java/android/database/sqlite/SQLiteDatabase.java

+3 −2
Original line number Diff line number Diff line
@@ -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) {

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+4 −2
Original line number Diff line number Diff line
@@ -748,9 +748,11 @@ public class SettingsProvider extends ContentProvider { 
        }



        @Override

        protected synchronized void entryEvicted(String key, Bundle value) {

        protected void entryRemoved(boolean evicted, String key, Bundle oldValue, Bundle newValue) {

            if (evicted) {

                mCacheFullyMatchesDisk = false;

            }

        }



        /**

         * Atomic cache population, conditional on size of value and if