Bug 1256427 - Move to AtomicFile in framework from support lib. r=sebastian draft
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 23 Mar 2016 10:30:52 -0700
changeset 343983 0c1619d54b2a2f40952e7b01e6b9133aaabdc991
parent 343982 14baf6951f4cb195edc6b5c99ffa3065eb6c9d1a
child 516868 03756198f1084079a626966426a20b60e2d1c88e
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 AtomicFile in framework from support lib. r=sebastian MozReview-Commit-ID: 6DOKydvvSGJ
mobile/android/base/java/org/mozilla/gecko/dlc/catalog/DownloadContentCatalog.java
mobile/android/base/java/org/mozilla/gecko/feeds/subscriptions/SubscriptionStorage.java
mobile/android/base/java/org/mozilla/gecko/push/PushState.java
mobile/android/tests/background/junit4/src/org/mozilla/gecko/dlc/catalog/TestDownloadContentCatalog.java
--- a/mobile/android/base/java/org/mozilla/gecko/dlc/catalog/DownloadContentCatalog.java
+++ b/mobile/android/base/java/org/mozilla/gecko/dlc/catalog/DownloadContentCatalog.java
@@ -1,17 +1,17 @@
 /* -*- 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.dlc.catalog;
 
 import android.content.Context;
-import android.support.v4.util.AtomicFile;
+import android.util.AtomicFile;
 import android.util.Log;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.File;
 import java.io.FileNotFoundException;
--- a/mobile/android/base/java/org/mozilla/gecko/feeds/subscriptions/SubscriptionStorage.java
+++ b/mobile/android/base/java/org/mozilla/gecko/feeds/subscriptions/SubscriptionStorage.java
@@ -1,18 +1,18 @@
 /* -*- 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.feeds.subscriptions;
 
 import android.content.Context;
-import android.support.v4.util.AtomicFile;
 import android.text.TextUtils;
+import android.util.AtomicFile;
 import android.util.Log;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.mozilla.gecko.feeds.FeedFetcher;
 
 import java.io.File;
--- a/mobile/android/base/java/org/mozilla/gecko/push/PushState.java
+++ b/mobile/android/base/java/org/mozilla/gecko/push/PushState.java
@@ -3,17 +3,17 @@
  * 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.push;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.WorkerThread;
-import android.support.v4.util.AtomicFile;
+import android.util.AtomicFile;
 import android.util.Log;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
--- a/mobile/android/tests/background/junit4/src/org/mozilla/gecko/dlc/catalog/TestDownloadContentCatalog.java
+++ b/mobile/android/tests/background/junit4/src/org/mozilla/gecko/dlc/catalog/TestDownloadContentCatalog.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.dlc.catalog;
 
-import android.support.v4.util.AtomicFile;
+import android.util.AtomicFile;
 
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.background.testhelpers.TestRunner;