commit 20806793cef4e5983f44fec9f9b3bfbb37d1ad86
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 30 21:46:18 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 30 21:46:18 2020 +0000
tree b22cc31f0e9f6b0a93fbd93ac956de5460245bc1
parent 3ea160cf37cd568772866243ae392af1849bd19f
parent 9130bc14b24e0a84573f9b9f87a3ced6f934876c

Merge "Use com.android.telephony.Rlog for mainline module."

src/com/android/ons/ONSNetworkScanCtlr.java

diff --git a/src/com/android/ons/ONSNetworkScanCtlr.java b/src/com/android/ons/ONSNetworkScanCtlr.java
index 243b217..ca09c73 100644
--- a/src/com/android/ons/ONSNetworkScanCtlr.java
+++ b/src/com/android/ons/ONSNetworkScanCtlr.java
@@ -29,7 +29,7 @@
 import android.telephony.NetworkScan;
 import android.telephony.NetworkScanRequest;
 import android.telephony.RadioAccessSpecifier;
-import android.telephony.Rlog;
+import com.android.telephony.Rlog;
 import android.telephony.SubscriptionInfo;
 import android.telephony.TelephonyManager;
 import android.telephony.TelephonyScanManager;

src/com/android/ons/ONSProfileSelector.java

diff --git a/src/com/android/ons/ONSProfileSelector.java b/src/com/android/ons/ONSProfileSelector.java
index f043319..6f9e247 100644
--- a/src/com/android/ons/ONSProfileSelector.java
+++ b/src/com/android/ons/ONSProfileSelector.java
@@ -34,7 +34,7 @@
 import android.telephony.AvailableNetworkInfo;
 import android.telephony.CellInfo;
 import android.telephony.CellInfoLte;
-import android.telephony.Rlog;
+import com.android.telephony.Rlog;
 import android.telephony.SignalStrength;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;

src/com/android/ons/OpportunisticNetworkService.java

diff --git a/src/com/android/ons/OpportunisticNetworkService.java b/src/com/android/ons/OpportunisticNetworkService.java
index 64212f0..54b986a 100644
--- a/src/com/android/ons/OpportunisticNetworkService.java
+++ b/src/com/android/ons/OpportunisticNetworkService.java
@@ -34,7 +34,7 @@
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.telephony.AvailableNetworkInfo;
-import android.telephony.Rlog;
+import com.android.telephony.Rlog;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;

tests/src/com/android/ons/ONSBaseTest.java

diff --git a/tests/src/com/android/ons/ONSBaseTest.java b/tests/src/com/android/ons/ONSBaseTest.java
index d3f62b1..f7fe761 100644
--- a/tests/src/com/android/ons/ONSBaseTest.java
+++ b/tests/src/com/android/ons/ONSBaseTest.java
@@ -16,7 +16,7 @@
 package com.android.ons;
 
 import android.content.Context;
-import android.telephony.Rlog;
+import com.android.telephony.Rlog;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.test.AndroidTestCase;