summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-31 02:50:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-31 02:50:41 +0000
commit0a7ff2295e5cda68982ca09da09bfa67413025e9 (patch)
treebd8f2d2a6bfa0113209f479f783b5b13daf4287f
parentd991c7d434c42bba41ba482c9e03e3df086c3a0f (diff)
parentdaeba8c5831c622a8987d6df233face74010319f (diff)
downloadAlternativeNetworkAccess-0a7ff2295e5cda68982ca09da09bfa67413025e9.tar.gz
Fix import of Rlog - generated by formatting tool am: 3aa74a7a16 am: daeba8c583
Change-Id: Ie5166e0f2767d6e254ba0b57b56fa76e0c04946f
-rw-r--r--src/com/android/ons/ONSNetworkScanCtlr.java3
-rw-r--r--src/com/android/ons/ONSProfileSelector.java4
-rw-r--r--src/com/android/ons/OpportunisticNetworkService.java4
-rw-r--r--tests/src/com/android/ons/ONSBaseTest.java3
4 files changed, 6 insertions, 8 deletions
diff --git a/src/com/android/ons/ONSNetworkScanCtlr.java b/src/com/android/ons/ONSNetworkScanCtlr.java
index ca09c73..181a56c 100644
--- a/src/com/android/ons/ONSNetworkScanCtlr.java
+++ b/src/com/android/ons/ONSNetworkScanCtlr.java
@@ -29,13 +29,12 @@ import android.telephony.CellInfoLte;
import android.telephony.NetworkScan;
import android.telephony.NetworkScanRequest;
import android.telephony.RadioAccessSpecifier;
-import com.android.telephony.Rlog;
-import android.telephony.SubscriptionInfo;
import android.telephony.TelephonyManager;
import android.telephony.TelephonyScanManager;
import android.util.ArraySet;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.telephony.Rlog;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/ons/ONSProfileSelector.java b/src/com/android/ons/ONSProfileSelector.java
index 2ee17fa..029eb8a 100644
--- a/src/com/android/ons/ONSProfileSelector.java
+++ b/src/com/android/ons/ONSProfileSelector.java
@@ -21,10 +21,8 @@ import static android.telephony.AvailableNetworkInfo.PRIORITY_LOW;
import android.app.PendingIntent;
import android.compat.Compatibility;
-import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
-import android.content.IntentFilter;
import android.os.AsyncTask;
import android.os.Handler;
import android.os.HandlerThread;
@@ -34,7 +32,6 @@ import android.os.ServiceManager;
import android.telephony.AvailableNetworkInfo;
import android.telephony.CellInfo;
import android.telephony.CellInfoLte;
-import com.android.telephony.Rlog;
import android.telephony.SignalStrength;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
@@ -45,6 +42,7 @@ import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.ISetOpportunisticDataCallback;
import com.android.internal.telephony.ISub;
import com.android.internal.telephony.IUpdateAvailableNetworksCallback;
+import com.android.telephony.Rlog;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/src/com/android/ons/OpportunisticNetworkService.java b/src/com/android/ons/OpportunisticNetworkService.java
index 82a6e17..7cb3238 100644
--- a/src/com/android/ons/OpportunisticNetworkService.java
+++ b/src/com/android/ons/OpportunisticNetworkService.java
@@ -26,12 +26,11 @@ import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.Binder;
import android.os.Handler;
-import android.os.Message;
import android.os.IBinder;
+import android.os.Message;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.telephony.AvailableNetworkInfo;
-import com.android.telephony.Rlog;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -42,6 +41,7 @@ import com.android.internal.telephony.ISetOpportunisticDataCallback;
import com.android.internal.telephony.IUpdateAvailableNetworksCallback;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.TelephonyPermissions;
+import com.android.telephony.Rlog;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/tests/src/com/android/ons/ONSBaseTest.java b/tests/src/com/android/ons/ONSBaseTest.java
index f7fe761..d31fa9b 100644
--- a/tests/src/com/android/ons/ONSBaseTest.java
+++ b/tests/src/com/android/ons/ONSBaseTest.java
@@ -16,13 +16,14 @@
package com.android.ons;
import android.content.Context;
-import com.android.telephony.Rlog;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.test.AndroidTestCase;
import androidx.test.InstrumentationRegistry;
+import com.android.telephony.Rlog;
+
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;