summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-31 03:05:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-31 03:05:34 +0000
commita8281f8117c1d76620db3771a75ced2c6e65e3e2 (patch)
treed86f3e5a69c7a69ebc0fc27aca63e12eb6914ddd
parent0315553f8ff26ff33ced38e05b504537aa6c5210 (diff)
parent0a7ff2295e5cda68982ca09da09bfa67413025e9 (diff)
downloadAlternativeNetworkAccess-a8281f8117c1d76620db3771a75ced2c6e65e3e2.tar.gz
Fix import of Rlog - generated by formatting tool am: 3aa74a7a16 am: daeba8c583 am: 0a7ff2295e
Change-Id: I64c569d8cad2877f833cd670fe323c77d6288dbf
-rw-r--r--src/com/android/ons/ONSNetworkScanCtlr.java3
-rw-r--r--src/com/android/ons/ONSProfileSelector.java2
-rw-r--r--src/com/android/ons/OpportunisticNetworkService.java2
-rw-r--r--tests/src/com/android/ons/ONSBaseTest.java3
4 files changed, 4 insertions, 6 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 3315c22..3e903c9 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;
diff --git a/src/com/android/ons/OpportunisticNetworkService.java b/src/com/android/ons/OpportunisticNetworkService.java
index 7de415b..1178538 100644
--- a/src/com/android/ons/OpportunisticNetworkService.java
+++ b/src/com/android/ons/OpportunisticNetworkService.java
@@ -34,7 +34,6 @@ import android.os.Message;
import android.os.RemoteException;
import android.os.TelephonyServiceManager.ServiceRegisterer;
import android.telephony.AvailableNetworkInfo;
-import com.android.telephony.Rlog;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyFrameworkInitializer;
@@ -46,6 +45,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;