Bug 1256427 - Move to LruCache in framework from support lib. r=sebastian draft
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 23 Mar 2016 10:29:25 -0700
changeset 343982 14baf6951f4cb195edc6b5c99ffa3065eb6c9d1a
parent 343112 4ad5b5dfe6e9da11d1d51d54cd6206bdf2fb5d32
child 343983 0c1619d54b2a2f40952e7b01e6b9133aaabdc991
push id13731
push usermichael.l.comella@gmail.com
push dateWed, 23 Mar 2016 17:31:07 +0000
reviewerssebastian
bugs1256427
milestone48.0a1
Bug 1256427 - Move to LruCache in framework from support lib. r=sebastian MozReview-Commit-ID: HImxvIVjIhw
mobile/android/base/java/org/mozilla/gecko/db/LocalURLMetadata.java
mobile/android/base/java/org/mozilla/gecko/util/NonEvictingLruCache.java
--- a/mobile/android/base/java/org/mozilla/gecko/db/LocalURLMetadata.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/LocalURLMetadata.java
@@ -20,18 +20,18 @@ import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.favicons.Favicons;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.v4.util.LruCache;
 import android.util.Log;
+import android.util.LruCache;
 
 // Holds metadata info about URLs. Supports some helper functions for getting back a HashMap of key value data.
 public class LocalURLMetadata implements URLMetadata {
     private static final String LOGTAG = "GeckoURLMetadata";
     private final Uri uriWithProfile;
 
     public LocalURLMetadata(String mProfile) {
         uriWithProfile = DBUtils.appendProfileWithDefault(mProfile, URLMetadataTable.CONTENT_URI);
--- a/mobile/android/base/java/org/mozilla/gecko/util/NonEvictingLruCache.java
+++ b/mobile/android/base/java/org/mozilla/gecko/util/NonEvictingLruCache.java
@@ -1,16 +1,16 @@
 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.util;
 
-import android.support.v4.util.LruCache;
+import android.util.LruCache;
 
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * An LruCache that also supports a set of items that will never be evicted.
  *
  * Alas, LruCache is final, so we compose rather than inherit.
  */