Bug 1256427 - Move to LruCache in framework from support lib. r=sebastian
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 23 Mar 2016 10:29:25 -0700
changeset 290034 358a57aa077a81210fd12e1fb8fa4e6ec0039fdd
parent 290033 7b0bb5c3ab01ab5003c64d2c715742db93eb9fd1
child 290035 57572ba7a904bde259fa2f5a841cc06e7c816a55
push id30113
push usercbook@mozilla.com
push dateThu, 24 Mar 2016 15:06:00 +0000
treeherdermozilla-central@b999fac0569d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssebastian
bugs1256427
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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.
  */