diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-30 22:11:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-30 22:11:41 +0000 |
| commit | d991c7d434c42bba41ba482c9e03e3df086c3a0f (patch) | |
| tree | 00d1d84d31a05d5b87f446860864681f52aa3388 | |
| parent | 551c4e3174d15bebea9fb48dd8108501f645824d (diff) | |
| parent | 93ef7203eb59210123761638cb017c6243fc41b6 (diff) | |
| download | AlternativeNetworkAccess-d991c7d434c42bba41ba482c9e03e3df086c3a0f.tar.gz | |
Merge "Use com.android.telephony.Rlog for mainline module." am: 20806793ce am: 93ef7203eb
Change-Id: If3250c0003ca63ef223a58c4cbf3f3d9aab9df85
| -rw-r--r-- | src/com/android/ons/ONSNetworkScanCtlr.java | 2 | ||||
| -rw-r--r-- | src/com/android/ons/ONSProfileSelector.java | 2 | ||||
| -rw-r--r-- | src/com/android/ons/OpportunisticNetworkService.java | 2 | ||||
| -rw-r--r-- | tests/src/com/android/ons/ONSBaseTest.java | 2 |
4 files changed, 4 insertions, 4 deletions
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.CellInfoLte; 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; diff --git a/src/com/android/ons/ONSProfileSelector.java b/src/com/android/ons/ONSProfileSelector.java index 82f5f86..2ee17fa 100644 --- a/src/com/android/ons/ONSProfileSelector.java +++ b/src/com/android/ons/ONSProfileSelector.java @@ -34,7 +34,7 @@ import android.os.ServiceManager; 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; diff --git a/src/com/android/ons/OpportunisticNetworkService.java b/src/com/android/ons/OpportunisticNetworkService.java index 2ea684c..82a6e17 100644 --- a/src/com/android/ons/OpportunisticNetworkService.java +++ b/src/com/android/ons/OpportunisticNetworkService.java @@ -31,7 +31,7 @@ import android.os.IBinder; 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; 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; |