From aeb88736a3e9a1ccea8d985e0ed094aa4afe92f2 Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Wed, 8 Jan 2020 17:57:39 -0800 Subject: Use com.android.telephony.Rlog for mainline module. Bug: 144374158 Test: make Merged-In: I23ec4cb2c343490ef2d45cad3baf2e7ad6f89301 Merged-In: I160a345e425666b372cfc798e8e644818478a3dc Change-Id: I23ec4cb2c343490ef2d45cad3baf2e7ad6f89301 --- .../telephony/AsyncEmergencyContactNotifier.java | 3 ++- .../com/android/internal/telephony/BlockChecker.java | 3 ++- src/java/com/android/internal/telephony/Call.java | 2 +- .../com/android/internal/telephony/CallForwardInfo.java | 3 ++- src/java/com/android/internal/telephony/CallManager.java | 4 +--- .../android/internal/telephony/CarrierActionAgent.java | 2 +- .../com/android/internal/telephony/CarrierResolver.java | 2 +- .../internal/telephony/CarrierServiceStateTracker.java | 4 +--- .../internal/telephony/CarrierServicesSmsFilter.java | 2 +- .../android/internal/telephony/CarrierSignalAgent.java | 8 ++++---- .../com/android/internal/telephony/CarrierSmsUtils.java | 3 ++- .../internal/telephony/CellularNetworkService.java | 3 ++- .../internal/telephony/ClientWakelockAccountant.java | 3 ++- .../com/android/internal/telephony/CommandException.java | 3 ++- src/java/com/android/internal/telephony/Connection.java | 2 +- .../com/android/internal/telephony/DebugService.java | 2 +- .../android/internal/telephony/DefaultPhoneNotifier.java | 2 +- .../android/internal/telephony/DeviceStateMonitor.java | 2 +- src/java/com/android/internal/telephony/DriverCall.java | 3 ++- .../android/internal/telephony/GsmCdmaCallTracker.java | 2 +- .../android/internal/telephony/GsmCdmaConnection.java | 2 +- .../com/android/internal/telephony/GsmCdmaPhone.java | 2 +- .../com/android/internal/telephony/HardwareConfig.java | 2 -- .../internal/telephony/IccPhoneBookInterfaceManager.java | 2 +- src/java/com/android/internal/telephony/IccProvider.java | 3 +-- .../internal/telephony/IccSmsInterfaceManager.java | 2 +- .../com/android/internal/telephony/ImsSmsDispatcher.java | 2 +- .../android/internal/telephony/InboundSmsHandler.java | 2 +- .../com/android/internal/telephony/LocaleTracker.java | 2 +- src/java/com/android/internal/telephony/MccTable.java | 2 +- .../internal/telephony/NetworkRegistrationManager.java | 3 ++- src/java/com/android/internal/telephony/NitzData.java | 3 +-- .../android/internal/telephony/NitzStateMachineImpl.java | 2 +- src/java/com/android/internal/telephony/Phone.java | 2 +- .../internal/telephony/PhoneConfigurationManager.java | 2 +- .../com/android/internal/telephony/PhoneFactory.java | 2 +- .../internal/telephony/PhoneStateIntentReceiver.java | 3 ++- .../internal/telephony/PhoneSubInfoController.java | 2 +- .../com/android/internal/telephony/PhoneSwitcher.java | 2 +- .../com/android/internal/telephony/ProxyController.java | 2 +- src/java/com/android/internal/telephony/RIL.java | 2 +- src/java/com/android/internal/telephony/RILRequest.java | 3 ++- src/java/com/android/internal/telephony/RadioConfig.java | 2 +- .../internal/telephony/RadioConfigIndication.java | 2 +- .../android/internal/telephony/RadioConfigResponse.java | 2 +- .../com/android/internal/telephony/RatRatcheter.java | 3 ++- .../com/android/internal/telephony/RetryManager.java | 2 +- .../com/android/internal/telephony/RilWakelockInfo.java | 2 +- .../com/android/internal/telephony/SMSDispatcher.java | 2 +- .../android/internal/telephony/ServiceStateTracker.java | 2 +- .../com/android/internal/telephony/SettingsObserver.java | 3 ++- .../android/internal/telephony/SimActivationTracker.java | 15 +++++++-------- .../internal/telephony/SmsBroadcastUndelivered.java | 2 +- .../com/android/internal/telephony/SmsController.java | 2 +- .../internal/telephony/SmsDispatchersController.java | 2 +- .../com/android/internal/telephony/SmsPermissions.java | 3 ++- .../android/internal/telephony/SmsStorageMonitor.java | 3 ++- .../com/android/internal/telephony/SmsUsageMonitor.java | 2 +- .../internal/telephony/SubscriptionController.java | 2 +- .../internal/telephony/TelephonyCapabilities.java | 3 ++- .../internal/telephony/TelephonyComponentFactory.java | 4 +--- .../internal/telephony/TelephonyDevController.java | 16 +++++----------- .../com/android/internal/telephony/TelephonyTester.java | 2 +- .../internal/telephony/UiccPhoneBookController.java | 3 +-- .../android/internal/telephony/WakeLockStateMachine.java | 2 +- .../com/android/internal/telephony/WapPushOverSms.java | 2 +- src/java/com/android/internal/telephony/cat/CatLog.java | 3 ++- .../android/internal/telephony/cat/ComprehensionTlv.java | 4 ++-- .../telephony/cdma/CdmaCallWaitingNotification.java | 2 +- .../com/android/internal/telephony/cdma/CdmaMmiCode.java | 2 +- .../internal/telephony/cdma/CdmaSMSDispatcher.java | 3 +-- .../telephony/cdma/CdmaSubscriptionSourceManager.java | 2 +- .../com/android/internal/telephony/cdma/EriManager.java | 2 +- .../internal/telephony/cdnr/CarrierConfigEfData.java | 2 +- .../telephony/cdnr/CarrierDisplayNameResolver.java | 2 +- .../telephony/dataconnection/AccessNetworksManager.java | 2 +- .../internal/telephony/dataconnection/ApnContext.java | 2 +- .../telephony/dataconnection/ApnSettingUtils.java | 2 +- .../telephony/dataconnection/CellularDataService.java | 2 +- .../telephony/dataconnection/DataEnabledSettings.java | 2 +- .../telephony/dataconnection/DataServiceManager.java | 2 +- .../internal/telephony/dataconnection/DcController.java | 2 +- .../internal/telephony/dataconnection/DcFailBringUp.java | 3 ++- .../telephony/dataconnection/DcTesterDeactivateAll.java | 2 +- .../telephony/dataconnection/DcTesterFailBringUpAll.java | 2 +- .../internal/telephony/dataconnection/DcTracker.java | 3 ++- .../dataconnection/TelephonyNetworkFactory.java | 2 +- .../telephony/dataconnection/TransportManager.java | 2 +- .../telephony/emergency/EmergencyNumberTracker.java | 2 +- .../com/android/internal/telephony/gsm/GsmMmiCode.java | 2 +- .../android/internal/telephony/gsm/GsmSMSDispatcher.java | 2 +- src/java/com/android/internal/telephony/gsm/SsData.java | 4 +--- .../internal/telephony/gsm/UsimDataDownloadHandler.java | 2 +- .../internal/telephony/gsm/UsimPhoneBookManager.java | 2 +- .../android/internal/telephony/imsphone/ImsPhone.java | 2 +- .../internal/telephony/imsphone/ImsPhoneBase.java | 2 +- .../internal/telephony/imsphone/ImsPhoneCall.java | 2 +- .../internal/telephony/imsphone/ImsPhoneCallTracker.java | 2 +- .../internal/telephony/imsphone/ImsPhoneConnection.java | 2 +- .../internal/telephony/imsphone/ImsPhoneFactory.java | 6 +++--- .../internal/telephony/imsphone/ImsPhoneMmiCode.java | 2 +- .../internal/telephony/imsphone/ImsRttTextHandler.java | 2 +- .../internal/telephony/metrics/CallQualityMetrics.java | 2 +- .../internal/telephony/metrics/TelephonyMetrics.java | 2 +- .../internal/telephony/nitz/NewNitzStateMachineImpl.java | 2 +- .../nitz/NitzSignalInputFilterPredicateFactory.java | 2 +- .../internal/telephony/nitz/TimeZoneSuggesterImpl.java | 2 +- .../internal/telephony/sip/SipConnectionBase.java | 9 ++++----- .../com/android/internal/telephony/sip/SipPhone.java | 2 +- .../com/android/internal/telephony/sip/SipPhoneBase.java | 2 +- .../android/internal/telephony/sip/SipPhoneFactory.java | 6 +++--- .../com/android/internal/telephony/uicc/AdnRecord.java | 3 +-- .../android/internal/telephony/uicc/AdnRecordLoader.java | 3 ++- .../android/internal/telephony/uicc/AnswerToReset.java | 2 +- .../internal/telephony/uicc/CarrierTestOverride.java | 2 +- .../android/internal/telephony/uicc/CsimFileHandler.java | 3 +-- .../telephony/uicc/IccCardApplicationStatus.java | 3 +-- .../com/android/internal/telephony/uicc/IccRecords.java | 2 +- .../android/internal/telephony/uicc/IccServiceTable.java | 3 ++- .../android/internal/telephony/uicc/IsimFileHandler.java | 3 +-- .../android/internal/telephony/uicc/IsimUiccRecords.java | 2 +- .../android/internal/telephony/uicc/PlmnActRecord.java | 3 ++- .../android/internal/telephony/uicc/RuimFileHandler.java | 2 +- .../com/android/internal/telephony/uicc/RuimRecords.java | 2 +- .../android/internal/telephony/uicc/SIMFileHandler.java | 3 +-- .../com/android/internal/telephony/uicc/SIMRecords.java | 2 +- .../com/android/internal/telephony/uicc/UiccCard.java | 2 +- .../internal/telephony/uicc/UiccCardApplication.java | 2 +- .../telephony/uicc/UiccCarrierPrivilegeRules.java | 2 +- .../android/internal/telephony/uicc/UiccController.java | 2 +- .../com/android/internal/telephony/uicc/UiccPkcs15.java | 2 +- .../com/android/internal/telephony/uicc/UiccProfile.java | 2 +- .../com/android/internal/telephony/uicc/UiccSlot.java | 2 +- .../android/internal/telephony/uicc/UsimFileHandler.java | 4 +--- .../internal/telephony/uicc/VoiceMailConstants.java | 2 +- .../android/internal/telephony/uicc/euicc/EuiccCard.java | 2 +- .../internal/telephony/uicc/euicc/EuiccSpecVersion.java | 3 +-- .../internal/telephony/uicc/euicc/apdu/ApduSender.java | 2 +- .../uicc/euicc/apdu/CloseLogicalChannelInvocation.java | 2 +- .../uicc/euicc/apdu/OpenLogicalChannelInvocation.java | 2 +- .../euicc/apdu/TransmitApduLogicalChannelInvocation.java | 2 +- .../telephony/uicc/euicc/async/AsyncResultCallback.java | 2 +- .../com/android/internal/telephony/util/LocaleUtils.java | 2 +- .../com/android/internal/telephony/ModelInterpreter.java | 3 ++- .../android/internal/telephony/SimulatedCommands.java | 2 +- .../internal/telephony/SimulatedGsmCallState.java | 2 +- .../android/internal/telephony/SmsMessageBodyTest.java | 9 +-------- .../android/internal/telephony/cdma/CdmaSmsCbTest.java | 2 +- .../dataconnection/TelephonyNetworkFactoryTest.java | 3 +-- .../internal/telephony/gsm/GSMTestHandler.java.broken | 2 +- .../telephony/gsm/UsimDataDownloadCommands.java.broken | 2 +- .../telephony/gsm/UsimDataDownloadTest.java.broken | 2 +- 152 files changed, 195 insertions(+), 210 deletions(-) diff --git a/src/java/com/android/internal/telephony/AsyncEmergencyContactNotifier.java b/src/java/com/android/internal/telephony/AsyncEmergencyContactNotifier.java index fd6ccd4bd1..34fae4a752 100644 --- a/src/java/com/android/internal/telephony/AsyncEmergencyContactNotifier.java +++ b/src/java/com/android/internal/telephony/AsyncEmergencyContactNotifier.java @@ -19,7 +19,8 @@ package com.android.internal.telephony; import android.content.Context; import android.os.AsyncTask; import android.provider.BlockedNumberContract; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; /** * An {@link AsyncTask} that notifies the Blocked number provider that emergency services were diff --git a/src/java/com/android/internal/telephony/BlockChecker.java b/src/java/com/android/internal/telephony/BlockChecker.java index 19981ebe76..f6b6356afd 100644 --- a/src/java/com/android/internal/telephony/BlockChecker.java +++ b/src/java/com/android/internal/telephony/BlockChecker.java @@ -3,7 +3,8 @@ package com.android.internal.telephony; import android.content.Context; import android.os.Bundle; import android.provider.BlockedNumberContract; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; /** * {@hide} Checks for blocked phone numbers against {@link BlockedNumberContract} diff --git a/src/java/com/android/internal/telephony/Call.java b/src/java/com/android/internal/telephony/Call.java index 4e9f105c82..d3cb5847eb 100644 --- a/src/java/com/android/internal/telephony/Call.java +++ b/src/java/com/android/internal/telephony/Call.java @@ -17,9 +17,9 @@ package com.android.internal.telephony; import android.compat.annotation.UnsupportedAppUsage; -import android.telephony.Rlog; import com.android.ims.internal.ConferenceParticipant; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.List; diff --git a/src/java/com/android/internal/telephony/CallForwardInfo.java b/src/java/com/android/internal/telephony/CallForwardInfo.java index 1f8b536b0c..2a8319b173 100644 --- a/src/java/com/android/internal/telephony/CallForwardInfo.java +++ b/src/java/com/android/internal/telephony/CallForwardInfo.java @@ -17,7 +17,8 @@ package com.android.internal.telephony; import android.compat.annotation.UnsupportedAppUsage; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; /** * See also RIL_CallForwardInfo in include/telephony/ril.h diff --git a/src/java/com/android/internal/telephony/CallManager.java b/src/java/com/android/internal/telephony/CallManager.java index 35abbd1490..151a4bf56a 100644 --- a/src/java/com/android/internal/telephony/CallManager.java +++ b/src/java/com/android/internal/telephony/CallManager.java @@ -25,18 +25,16 @@ import android.os.Registrant; import android.os.RegistrantList; import android.telephony.PhoneNumberUtils; import android.telephony.PhoneStateListener; -import android.telephony.Rlog; import android.telephony.ServiceState; import com.android.internal.telephony.sip.SipPhone; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; - - /** * @hide * diff --git a/src/java/com/android/internal/telephony/CarrierActionAgent.java b/src/java/com/android/internal/telephony/CarrierActionAgent.java index 568d40c39f..df2c749ba3 100644 --- a/src/java/com/android/internal/telephony/CarrierActionAgent.java +++ b/src/java/com/android/internal/telephony/CarrierActionAgent.java @@ -27,13 +27,13 @@ import android.os.Registrant; import android.os.RegistrantList; import android.provider.Settings; import android.provider.Telephony; -import android.telephony.Rlog; import android.telephony.TelephonyManager; import android.util.LocalLog; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/CarrierResolver.java b/src/java/com/android/internal/telephony/CarrierResolver.java index 959522f035..ea31a4b1e8 100644 --- a/src/java/com/android/internal/telephony/CarrierResolver.java +++ b/src/java/com/android/internal/telephony/CarrierResolver.java @@ -29,7 +29,6 @@ import android.os.Message; import android.provider.Telephony; import android.service.carrier.CarrierIdentifier; import android.telephony.PhoneStateListener; -import android.telephony.Rlog; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.text.TextUtils; @@ -41,6 +40,7 @@ import com.android.internal.telephony.metrics.TelephonyMetrics; import com.android.internal.telephony.uicc.IccRecords; import com.android.internal.telephony.uicc.UiccController; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/CarrierServiceStateTracker.java b/src/java/com/android/internal/telephony/CarrierServiceStateTracker.java index de3cdcb75b..112daf51fe 100644 --- a/src/java/com/android/internal/telephony/CarrierServiceStateTracker.java +++ b/src/java/com/android/internal/telephony/CarrierServiceStateTracker.java @@ -30,19 +30,17 @@ import android.os.Message; import android.os.PersistableBundle; import android.provider.Settings; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.util.NotificationChannelController; +import com.android.telephony.Rlog; import java.util.HashMap; import java.util.Map; - - /** * This contains Carrier specific logic based on the states/events * managed in ServiceStateTracker. diff --git a/src/java/com/android/internal/telephony/CarrierServicesSmsFilter.java b/src/java/com/android/internal/telephony/CarrierServicesSmsFilter.java index 24e50593fc..cabb00997d 100644 --- a/src/java/com/android/internal/telephony/CarrierServicesSmsFilter.java +++ b/src/java/com/android/internal/telephony/CarrierServicesSmsFilter.java @@ -27,12 +27,12 @@ import android.service.carrier.CarrierMessagingService; import android.service.carrier.CarrierMessagingServiceWrapper; import android.service.carrier.CarrierMessagingServiceWrapper.CarrierMessagingCallbackWrapper; import android.service.carrier.MessagePdu; -import android.telephony.Rlog; import android.util.LocalLog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.uicc.UiccCard; import com.android.internal.telephony.uicc.UiccController; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/java/com/android/internal/telephony/CarrierSignalAgent.java b/src/java/com/android/internal/telephony/CarrierSignalAgent.java index e9c3a73d9e..79df2a2215 100644 --- a/src/java/com/android/internal/telephony/CarrierSignalAgent.java +++ b/src/java/com/android/internal/telephony/CarrierSignalAgent.java @@ -15,6 +15,9 @@ */ package com.android.internal.telephony; +import static android.telephony.CarrierConfigManager.KEY_CARRIER_APP_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY; +import static android.telephony.CarrierConfigManager.KEY_CARRIER_APP_WAKE_SIGNAL_CONFIG_STRING_ARRAY; + import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -30,7 +33,6 @@ import android.os.Message; import android.os.PersistableBundle; import android.os.UserHandle; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.telephony.SubscriptionManager; import android.text.TextUtils; import android.util.LocalLog; @@ -38,6 +40,7 @@ import android.util.Log; import com.android.internal.telephony.util.ArrayUtils; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -47,9 +50,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import static android.telephony.CarrierConfigManager.KEY_CARRIER_APP_WAKE_SIGNAL_CONFIG_STRING_ARRAY; -import static android.telephony.CarrierConfigManager.KEY_CARRIER_APP_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY; - /** * This class act as an CarrierSignalling Agent. * it load registered carrier signalling receivers from carrier config, cache the result to avoid diff --git a/src/java/com/android/internal/telephony/CarrierSmsUtils.java b/src/java/com/android/internal/telephony/CarrierSmsUtils.java index a64aea7ce3..f78d147623 100644 --- a/src/java/com/android/internal/telephony/CarrierSmsUtils.java +++ b/src/java/com/android/internal/telephony/CarrierSmsUtils.java @@ -24,7 +24,8 @@ import android.content.pm.ResolveInfo; import android.os.Binder; import android.os.PersistableBundle; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; import java.util.List; diff --git a/src/java/com/android/internal/telephony/CellularNetworkService.java b/src/java/com/android/internal/telephony/CellularNetworkService.java index 46f34e76c7..4971643580 100644 --- a/src/java/com/android/internal/telephony/CellularNetworkService.java +++ b/src/java/com/android/internal/telephony/CellularNetworkService.java @@ -30,11 +30,12 @@ import android.telephony.LteVopsSupportInfo; import android.telephony.NetworkRegistrationInfo; import android.telephony.NetworkService; import android.telephony.NetworkServiceCallback; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import com.android.telephony.Rlog; + import java.util.ArrayList; import java.util.List; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/java/com/android/internal/telephony/ClientWakelockAccountant.java b/src/java/com/android/internal/telephony/ClientWakelockAccountant.java index c47faab0c8..a78b520349 100644 --- a/src/java/com/android/internal/telephony/ClientWakelockAccountant.java +++ b/src/java/com/android/internal/telephony/ClientWakelockAccountant.java @@ -17,9 +17,10 @@ package com.android.internal.telephony; import android.telephony.ClientRequestStats; -import android.telephony.Rlog; import com.android.internal.annotations.VisibleForTesting; +import com.android.telephony.Rlog; + import java.util.ArrayList; public class ClientWakelockAccountant { diff --git a/src/java/com/android/internal/telephony/CommandException.java b/src/java/com/android/internal/telephony/CommandException.java index 5f8789d9b0..ccd9251a23 100644 --- a/src/java/com/android/internal/telephony/CommandException.java +++ b/src/java/com/android/internal/telephony/CommandException.java @@ -17,7 +17,8 @@ package com.android.internal.telephony; import android.compat.annotation.UnsupportedAppUsage; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; /** * {@hide} diff --git a/src/java/com/android/internal/telephony/Connection.java b/src/java/com/android/internal/telephony/Connection.java index 2906a7987a..18901ce2e2 100644 --- a/src/java/com/android/internal/telephony/Connection.java +++ b/src/java/com/android/internal/telephony/Connection.java @@ -21,7 +21,6 @@ import android.net.Uri; import android.os.Bundle; import android.os.SystemClock; import android.telephony.DisconnectCause; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.ServiceState.RilRadioTechnology; import android.telephony.emergency.EmergencyNumber; @@ -31,6 +30,7 @@ import com.android.ims.internal.ConferenceParticipant; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.emergency.EmergencyNumberTracker; import com.android.internal.telephony.util.TelephonyUtils; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.List; diff --git a/src/java/com/android/internal/telephony/DebugService.java b/src/java/com/android/internal/telephony/DebugService.java index 0002f14652..3a08243907 100644 --- a/src/java/com/android/internal/telephony/DebugService.java +++ b/src/java/com/android/internal/telephony/DebugService.java @@ -16,10 +16,10 @@ package com.android.internal.telephony; -import android.telephony.Rlog; import android.text.TextUtils; import com.android.internal.telephony.metrics.TelephonyMetrics; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java b/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java index c6109b3083..e8aafe7b9b 100644 --- a/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java +++ b/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java @@ -30,7 +30,6 @@ import android.telephony.CellInfo; import android.telephony.PhoneCapability; import android.telephony.PreciseCallState; import android.telephony.PreciseDataConnectionState; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.TelephonyManager; import android.telephony.TelephonyRegistryManager; @@ -38,6 +37,7 @@ import android.telephony.emergency.EmergencyNumber; import android.telephony.ims.ImsReasonInfo; import com.android.internal.telephony.PhoneInternalInterface.DataActivityState; +import com.android.telephony.Rlog; import java.util.List; diff --git a/src/java/com/android/internal/telephony/DeviceStateMonitor.java b/src/java/com/android/internal/telephony/DeviceStateMonitor.java index d84d5037dc..c94c4c3c0d 100644 --- a/src/java/com/android/internal/telephony/DeviceStateMonitor.java +++ b/src/java/com/android/internal/telephony/DeviceStateMonitor.java @@ -36,7 +36,6 @@ import android.os.Message; import android.os.PowerManager; import android.telephony.AccessNetworkConstants.AccessNetworkType; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.telephony.SignalThresholdInfo; import android.telephony.TelephonyManager; import android.util.LocalLog; @@ -45,6 +44,7 @@ import android.view.Display; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/DriverCall.java b/src/java/com/android/internal/telephony/DriverCall.java index a47503fe57..a67de7a69d 100644 --- a/src/java/com/android/internal/telephony/DriverCall.java +++ b/src/java/com/android/internal/telephony/DriverCall.java @@ -18,7 +18,8 @@ package com.android.internal.telephony; import android.compat.annotation.UnsupportedAppUsage; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; /** * {@hide} diff --git a/src/java/com/android/internal/telephony/GsmCdmaCallTracker.java b/src/java/com/android/internal/telephony/GsmCdmaCallTracker.java index 45511eb18c..2e868550e2 100755 --- a/src/java/com/android/internal/telephony/GsmCdmaCallTracker.java +++ b/src/java/com/android/internal/telephony/GsmCdmaCallTracker.java @@ -34,7 +34,6 @@ import android.telephony.CarrierConfigManager; import android.telephony.CellLocation; import android.telephony.DisconnectCause; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.telephony.ServiceState.RilRadioTechnology; import android.telephony.TelephonyManager; import android.telephony.cdma.CdmaCellLocation; @@ -45,6 +44,7 @@ import android.util.EventLog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.cdma.CdmaCallWaitingNotification; import com.android.internal.telephony.metrics.TelephonyMetrics; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/GsmCdmaConnection.java b/src/java/com/android/internal/telephony/GsmCdmaConnection.java index 7300893446..1c49f2040a 100644 --- a/src/java/com/android/internal/telephony/GsmCdmaConnection.java +++ b/src/java/com/android/internal/telephony/GsmCdmaConnection.java @@ -27,7 +27,6 @@ import android.os.SystemClock; import android.telephony.CarrierConfigManager; import android.telephony.DisconnectCause; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.text.TextUtils; @@ -37,6 +36,7 @@ import com.android.internal.telephony.emergency.EmergencyNumberTracker; import com.android.internal.telephony.metrics.TelephonyMetrics; import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState; import com.android.internal.telephony.uicc.UiccCardApplication; +import com.android.telephony.Rlog; /** * {@hide} diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java index ad0b35d415..c84ece8cf1 100644 --- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java +++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java @@ -66,7 +66,6 @@ import android.telephony.ImsiEncryptionInfo; import android.telephony.NetworkScanRequest; import android.telephony.PhoneNumberUtils; import android.telephony.PreciseDataConnectionState; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.ServiceState.RilRadioTechnology; import android.telephony.SignalThresholdInfo; @@ -105,6 +104,7 @@ import com.android.internal.telephony.uicc.UiccController; import com.android.internal.telephony.uicc.UiccProfile; import com.android.internal.telephony.uicc.UiccSlot; import com.android.internal.telephony.util.ArrayUtils; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/HardwareConfig.java b/src/java/com/android/internal/telephony/HardwareConfig.java index 86233547eb..cdce602141 100644 --- a/src/java/com/android/internal/telephony/HardwareConfig.java +++ b/src/java/com/android/internal/telephony/HardwareConfig.java @@ -16,9 +16,7 @@ package com.android.internal.telephony; -import android.telephony.Rlog; import java.util.BitSet; -import android.telephony.ServiceState; /** * {@hide} diff --git a/src/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java b/src/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java index 66ed9ed307..a290c735f1 100644 --- a/src/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java +++ b/src/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java @@ -22,7 +22,6 @@ import android.os.AsyncResult; import android.os.Handler; import android.os.Looper; import android.os.Message; -import android.telephony.Rlog; import com.android.internal.telephony.uicc.AdnRecord; import com.android.internal.telephony.uicc.AdnRecordCache; @@ -30,6 +29,7 @@ import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType; import com.android.internal.telephony.uicc.IccConstants; import com.android.internal.telephony.uicc.IccFileHandler; import com.android.internal.telephony.uicc.IccRecords; +import com.android.telephony.Rlog; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/java/com/android/internal/telephony/IccProvider.java b/src/java/com/android/internal/telephony/IccProvider.java index 5c33f0e398..76dc5187fa 100644 --- a/src/java/com/android/internal/telephony/IccProvider.java +++ b/src/java/com/android/internal/telephony/IccProvider.java @@ -26,17 +26,16 @@ import android.database.MergeCursor; import android.net.Uri; import android.os.RemoteException; import android.os.ServiceManager; -import android.telephony.Rlog; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.text.TextUtils; import com.android.internal.telephony.uicc.AdnRecord; import com.android.internal.telephony.uicc.IccConstants; +import com.android.telephony.Rlog; import java.util.List; - /** * {@hide} */ diff --git a/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java b/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java index 6c36c87c79..23e55190de 100644 --- a/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java +++ b/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java @@ -40,7 +40,6 @@ import android.os.Message; import android.os.UserManager; import android.provider.Telephony; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.telephony.SmsCbMessage; import android.telephony.SmsManager; import android.telephony.SmsMessage; @@ -58,6 +57,7 @@ import com.android.internal.telephony.uicc.IccUtils; import com.android.internal.telephony.uicc.UiccController; import com.android.internal.telephony.uicc.UiccProfile; import com.android.internal.util.HexDump; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/ImsSmsDispatcher.java b/src/java/com/android/internal/telephony/ImsSmsDispatcher.java index 58aac01710..4d7424e1c0 100644 --- a/src/java/com/android/internal/telephony/ImsSmsDispatcher.java +++ b/src/java/com/android/internal/telephony/ImsSmsDispatcher.java @@ -23,7 +23,6 @@ import android.os.RemoteException; import android.provider.Telephony.Sms.Intents; import android.telephony.CarrierConfigManager; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.ims.ImsReasonInfo; import android.telephony.ims.RegistrationManager; @@ -41,6 +40,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails; import com.android.internal.telephony.metrics.TelephonyMetrics; import com.android.internal.telephony.util.SMSDispatcherUtil; +import com.android.telephony.Rlog; import java.util.HashMap; import java.util.Map; diff --git a/src/java/com/android/internal/telephony/InboundSmsHandler.java b/src/java/com/android/internal/telephony/InboundSmsHandler.java index 2ff68e2f41..7b42e3f0a9 100644 --- a/src/java/com/android/internal/telephony/InboundSmsHandler.java +++ b/src/java/com/android/internal/telephony/InboundSmsHandler.java @@ -51,7 +51,6 @@ import android.os.UserManager; import android.provider.Telephony; import android.provider.Telephony.Sms.Intents; import android.service.carrier.CarrierMessagingService; -import android.telephony.Rlog; import android.telephony.SmsMessage; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -68,6 +67,7 @@ import com.android.internal.telephony.util.TelephonyUtils; import com.android.internal.util.HexDump; import com.android.internal.util.State; import com.android.internal.util.StateMachine; +import com.android.telephony.Rlog; import java.io.ByteArrayOutputStream; import java.io.FileDescriptor; diff --git a/src/java/com/android/internal/telephony/LocaleTracker.java b/src/java/com/android/internal/telephony/LocaleTracker.java index 21ca87836c..704e09e492 100755 --- a/src/java/com/android/internal/telephony/LocaleTracker.java +++ b/src/java/com/android/internal/telephony/LocaleTracker.java @@ -34,7 +34,6 @@ import android.telephony.CellInfo; import android.telephony.CellInfoGsm; import android.telephony.CellInfoLte; import android.telephony.CellInfoWcdma; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -45,6 +44,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.MccTable.MccMnc; import com.android.internal.telephony.util.TelephonyUtils; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/MccTable.java b/src/java/com/android/internal/telephony/MccTable.java index 05aa09db2f..14924025e1 100644 --- a/src/java/com/android/internal/telephony/MccTable.java +++ b/src/java/com/android/internal/telephony/MccTable.java @@ -25,7 +25,6 @@ import android.content.res.Configuration; import android.os.Build; import android.os.RemoteException; import android.os.SystemProperties; -import android.telephony.Rlog; import android.text.TextUtils; import android.timezone.TelephonyLookup; import android.timezone.TelephonyNetwork; @@ -34,6 +33,7 @@ import android.timezone.TelephonyNetworkFinder; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.util.TelephonyUtils; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.Collections; diff --git a/src/java/com/android/internal/telephony/NetworkRegistrationManager.java b/src/java/com/android/internal/telephony/NetworkRegistrationManager.java index bd90be68e8..716e7a2e7b 100644 --- a/src/java/com/android/internal/telephony/NetworkRegistrationManager.java +++ b/src/java/com/android/internal/telephony/NetworkRegistrationManager.java @@ -38,10 +38,11 @@ import android.telephony.INetworkService; import android.telephony.INetworkServiceCallback; import android.telephony.NetworkRegistrationInfo; import android.telephony.NetworkService; -import android.telephony.Rlog; import android.telephony.SubscriptionManager; import android.text.TextUtils; +import com.android.telephony.Rlog; + import java.util.Hashtable; import java.util.Map; diff --git a/src/java/com/android/internal/telephony/NitzData.java b/src/java/com/android/internal/telephony/NitzData.java index 8ecf742dc6..f508d9e5a4 100644 --- a/src/java/com/android/internal/telephony/NitzData.java +++ b/src/java/com/android/internal/telephony/NitzData.java @@ -18,9 +18,8 @@ package com.android.internal.telephony; import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE; -import android.telephony.Rlog; - import com.android.internal.annotations.VisibleForTesting; +import com.android.telephony.Rlog; import java.util.Calendar; import java.util.TimeZone; diff --git a/src/java/com/android/internal/telephony/NitzStateMachineImpl.java b/src/java/com/android/internal/telephony/NitzStateMachineImpl.java index f4c24fb204..ad21196f0a 100644 --- a/src/java/com/android/internal/telephony/NitzStateMachineImpl.java +++ b/src/java/com/android/internal/telephony/NitzStateMachineImpl.java @@ -20,7 +20,6 @@ import android.app.timedetector.PhoneTimeSuggestion; import android.content.Context; import android.os.PowerManager; import android.os.TimestampedValue; -import android.telephony.Rlog; import android.text.TextUtils; import android.timezone.CountryTimeZones.OffsetResult; import android.util.LocalLog; @@ -29,6 +28,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.TimeZoneLookupHelper.CountryResult; import com.android.internal.telephony.metrics.TelephonyMetrics; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/Phone.java b/src/java/com/android/internal/telephony/Phone.java index aaba5863e7..92b0294490 100644 --- a/src/java/com/android/internal/telephony/Phone.java +++ b/src/java/com/android/internal/telephony/Phone.java @@ -53,7 +53,6 @@ import android.telephony.PhoneStateListener; import android.telephony.PhysicalChannelConfig; import android.telephony.PreciseDataConnectionState; import android.telephony.RadioAccessFamily; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.SubscriptionManager; @@ -87,6 +86,7 @@ import com.android.internal.telephony.uicc.UiccCardApplication; import com.android.internal.telephony.uicc.UiccController; import com.android.internal.telephony.uicc.UsimServiceTable; import com.android.internal.telephony.util.TelephonyUtils; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/PhoneConfigurationManager.java b/src/java/com/android/internal/telephony/PhoneConfigurationManager.java index e5ba4851f5..43041994f7 100644 --- a/src/java/com/android/internal/telephony/PhoneConfigurationManager.java +++ b/src/java/com/android/internal/telephony/PhoneConfigurationManager.java @@ -29,12 +29,12 @@ import android.os.RegistrantList; import android.os.storage.StorageManager; import android.sysprop.TelephonyProperties; import android.telephony.PhoneCapability; -import android.telephony.Rlog; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; +import com.android.telephony.Rlog; import java.util.HashMap; import java.util.Map; diff --git a/src/java/com/android/internal/telephony/PhoneFactory.java b/src/java/com/android/internal/telephony/PhoneFactory.java index 10cff81b29..9b181d335d 100644 --- a/src/java/com/android/internal/telephony/PhoneFactory.java +++ b/src/java/com/android/internal/telephony/PhoneFactory.java @@ -34,7 +34,6 @@ import android.preference.PreferenceManager; import android.provider.Settings; import android.provider.Settings.SettingNotFoundException; import android.telephony.AnomalyReporter; -import android.telephony.Rlog; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.LocalLog; @@ -50,6 +49,7 @@ import com.android.internal.telephony.sip.SipPhoneFactory; import com.android.internal.telephony.uicc.UiccController; import com.android.internal.telephony.util.NotificationChannelController; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/PhoneStateIntentReceiver.java b/src/java/com/android/internal/telephony/PhoneStateIntentReceiver.java index 94b05ed7d0..6d0b03c885 100644 --- a/src/java/com/android/internal/telephony/PhoneStateIntentReceiver.java +++ b/src/java/com/android/internal/telephony/PhoneStateIntentReceiver.java @@ -23,11 +23,12 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Handler; import android.os.Message; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.TelephonyManager; +import com.android.telephony.Rlog; + /** * * DO NOT USE THIS CLASS: diff --git a/src/java/com/android/internal/telephony/PhoneSubInfoController.java b/src/java/com/android/internal/telephony/PhoneSubInfoController.java index 453b95c7f2..35af1b4a88 100644 --- a/src/java/com/android/internal/telephony/PhoneSubInfoController.java +++ b/src/java/com/android/internal/telephony/PhoneSubInfoController.java @@ -32,12 +32,12 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.telephony.ImsiEncryptionInfo; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.telephony.SubscriptionManager; import com.android.internal.telephony.uicc.IsimRecords; import com.android.internal.telephony.uicc.UiccCard; import com.android.internal.telephony.uicc.UiccCardApplication; +import com.android.telephony.Rlog; public class PhoneSubInfoController extends IPhoneSubInfo.Stub { private static final String TAG = "PhoneSubInfoController"; diff --git a/src/java/com/android/internal/telephony/PhoneSwitcher.java b/src/java/com/android/internal/telephony/PhoneSwitcher.java index bbc21d107d..907aca2509 100644 --- a/src/java/com/android/internal/telephony/PhoneSwitcher.java +++ b/src/java/com/android/internal/telephony/PhoneSwitcher.java @@ -51,7 +51,6 @@ import android.os.RemoteException; import android.telephony.CarrierConfigManager; import android.telephony.PhoneCapability; import android.telephony.PhoneStateListener; -import android.telephony.Rlog; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.telephony.TelephonyRegistryManager; @@ -65,6 +64,7 @@ import com.android.internal.telephony.nano.TelephonyProto.TelephonyEvent; import com.android.internal.telephony.nano.TelephonyProto.TelephonyEvent.DataSwitch; import com.android.internal.telephony.nano.TelephonyProto.TelephonyEvent.OnDemandDataSwitch; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/ProxyController.java b/src/java/com/android/internal/telephony/ProxyController.java index e0fcbb6d6b..d6ed87b571 100644 --- a/src/java/com/android/internal/telephony/ProxyController.java +++ b/src/java/com/android/internal/telephony/ProxyController.java @@ -27,12 +27,12 @@ import android.os.Message; import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.telephony.RadioAccessFamily; -import android.telephony.Rlog; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java index a5cbd59d1e..dfe9ce5b8c 100644 --- a/src/java/com/android/internal/telephony/RIL.java +++ b/src/java/com/android/internal/telephony/RIL.java @@ -86,7 +86,6 @@ import android.telephony.NetworkScanRequest; import android.telephony.PhoneNumberUtils; import android.telephony.RadioAccessFamily; import android.telephony.RadioAccessSpecifier; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.SignalThresholdInfo; @@ -114,6 +113,7 @@ import com.android.internal.telephony.metrics.TelephonyMetrics; import com.android.internal.telephony.nano.TelephonyProto.SmsSession; import com.android.internal.telephony.uicc.IccUtils; import com.android.internal.telephony.util.TelephonyUtils; +import com.android.telephony.Rlog; import java.io.ByteArrayInputStream; import java.io.DataInputStream; diff --git a/src/java/com/android/internal/telephony/RILRequest.java b/src/java/com/android/internal/telephony/RILRequest.java index 4c503f8c3d..0d5f8e7956 100644 --- a/src/java/com/android/internal/telephony/RILRequest.java +++ b/src/java/com/android/internal/telephony/RILRequest.java @@ -22,7 +22,8 @@ import android.os.Message; import android.os.SystemClock; import android.os.WorkSource; import android.os.WorkSource.WorkChain; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.Random; diff --git a/src/java/com/android/internal/telephony/RadioConfig.java b/src/java/com/android/internal/telephony/RadioConfig.java index 24d79f269e..24a77911cc 100644 --- a/src/java/com/android/internal/telephony/RadioConfig.java +++ b/src/java/com/android/internal/telephony/RadioConfig.java @@ -39,11 +39,11 @@ import android.os.Registrant; import android.os.RemoteException; import android.os.WorkSource; import android.telephony.PhoneCapability; -import android.telephony.Rlog; import android.telephony.SimSlotCapability; import android.util.SparseArray; import com.android.internal.telephony.uicc.IccSlotStatus; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/java/com/android/internal/telephony/RadioConfigIndication.java b/src/java/com/android/internal/telephony/RadioConfigIndication.java index 39af57b64f..639272cc53 100644 --- a/src/java/com/android/internal/telephony/RadioConfigIndication.java +++ b/src/java/com/android/internal/telephony/RadioConfigIndication.java @@ -18,9 +18,9 @@ package com.android.internal.telephony; import android.hardware.radio.config.V1_2.IRadioConfigIndication; import android.os.AsyncResult; -import android.telephony.Rlog; import com.android.internal.telephony.uicc.IccSlotStatus; +import com.android.telephony.Rlog; import java.util.ArrayList; diff --git a/src/java/com/android/internal/telephony/RadioConfigResponse.java b/src/java/com/android/internal/telephony/RadioConfigResponse.java index 7ab8d44d0f..0f4a7198e4 100644 --- a/src/java/com/android/internal/telephony/RadioConfigResponse.java +++ b/src/java/com/android/internal/telephony/RadioConfigResponse.java @@ -21,9 +21,9 @@ import android.hardware.radio.V1_0.RadioResponseInfo; import android.hardware.radio.config.V1_1.ModemsConfig; import android.hardware.radio.config.V1_2.IRadioConfigResponse; import android.telephony.PhoneCapability; -import android.telephony.Rlog; import com.android.internal.telephony.uicc.IccSlotStatus; +import com.android.telephony.Rlog; import java.util.ArrayList; diff --git a/src/java/com/android/internal/telephony/RatRatcheter.java b/src/java/com/android/internal/telephony/RatRatcheter.java index 6216200834..084223f653 100644 --- a/src/java/com/android/internal/telephony/RatRatcheter.java +++ b/src/java/com/android/internal/telephony/RatRatcheter.java @@ -27,11 +27,12 @@ import android.telephony.AccessNetworkConstants; import android.telephony.Annotation.NetworkType; import android.telephony.CarrierConfigManager; import android.telephony.NetworkRegistrationInfo; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.util.SparseArray; import android.util.SparseIntArray; +import com.android.telephony.Rlog; + import java.util.Arrays; /** diff --git a/src/java/com/android/internal/telephony/RetryManager.java b/src/java/com/android/internal/telephony/RetryManager.java index 67bc3c08bf..62cde52c71 100644 --- a/src/java/com/android/internal/telephony/RetryManager.java +++ b/src/java/com/android/internal/telephony/RetryManager.java @@ -21,12 +21,12 @@ import android.content.Context; import android.os.PersistableBundle; import android.os.SystemProperties; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.telephony.data.ApnSetting; import android.text.TextUtils; import android.util.Pair; import com.android.internal.telephony.util.TelephonyUtils; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.Random; diff --git a/src/java/com/android/internal/telephony/RilWakelockInfo.java b/src/java/com/android/internal/telephony/RilWakelockInfo.java index 28ccbc880d..a5aea58811 100644 --- a/src/java/com/android/internal/telephony/RilWakelockInfo.java +++ b/src/java/com/android/internal/telephony/RilWakelockInfo.java @@ -17,10 +17,10 @@ package com.android.internal.telephony; import android.annotation.TargetApi; -import android.telephony.Rlog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.util.TelephonyUtils; +import com.android.telephony.Rlog; @TargetApi(8) public class RilWakelockInfo { diff --git a/src/java/com/android/internal/telephony/SMSDispatcher.java b/src/java/com/android/internal/telephony/SMSDispatcher.java index ee398f9955..7ab55a1902 100644 --- a/src/java/com/android/internal/telephony/SMSDispatcher.java +++ b/src/java/com/android/internal/telephony/SMSDispatcher.java @@ -63,7 +63,6 @@ import android.service.carrier.CarrierMessagingServiceWrapper; import android.service.carrier.CarrierMessagingServiceWrapper.CarrierMessagingCallbackWrapper; import android.telephony.CarrierConfigManager; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.SmsManager; import android.telephony.TelephonyManager; @@ -86,6 +85,7 @@ import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails; import com.android.internal.telephony.cdma.sms.UserData; import com.android.internal.telephony.uicc.UiccCard; import com.android.internal.telephony.uicc.UiccController; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java index c6c827479c..c1ba12635d 100755 --- a/src/java/com/android/internal/telephony/ServiceStateTracker.java +++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java @@ -72,7 +72,6 @@ import android.telephony.CellSignalStrengthNr; import android.telephony.DataSpecificRegistrationInfo; import android.telephony.NetworkRegistrationInfo; import android.telephony.PhysicalChannelConfig; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.ServiceState.RilRadioTechnology; import android.telephony.SignalStrength; @@ -113,6 +112,7 @@ import com.android.internal.telephony.util.ArrayUtils; import com.android.internal.telephony.util.NotificationChannelController; import com.android.internal.telephony.util.TelephonyUtils; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/SettingsObserver.java b/src/java/com/android/internal/telephony/SettingsObserver.java index 2253c36704..e480b05e89 100644 --- a/src/java/com/android/internal/telephony/SettingsObserver.java +++ b/src/java/com/android/internal/telephony/SettingsObserver.java @@ -21,7 +21,8 @@ import android.content.Context; import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; import java.util.HashMap; import java.util.Map; diff --git a/src/java/com/android/internal/telephony/SimActivationTracker.java b/src/java/com/android/internal/telephony/SimActivationTracker.java index 8fd6eed13a..2daf858f42 100644 --- a/src/java/com/android/internal/telephony/SimActivationTracker.java +++ b/src/java/com/android/internal/telephony/SimActivationTracker.java @@ -15,25 +15,24 @@ */ package com.android.internal.telephony; +import static android.telephony.TelephonyManager.SIM_ACTIVATION_STATE_ACTIVATED; +import static android.telephony.TelephonyManager.SIM_ACTIVATION_STATE_ACTIVATING; +import static android.telephony.TelephonyManager.SIM_ACTIVATION_STATE_DEACTIVATED; +import static android.telephony.TelephonyManager.SIM_ACTIVATION_STATE_RESTRICTED; +import static android.telephony.TelephonyManager.SIM_ACTIVATION_STATE_UNKNOWN; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.telephony.Rlog; import android.util.LocalLog; import android.util.Log; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; -import java.security.InvalidParameterException; - -import static android.telephony.TelephonyManager.SIM_ACTIVATION_STATE_ACTIVATED; -import static android.telephony.TelephonyManager.SIM_ACTIVATION_STATE_DEACTIVATED; -import static android.telephony.TelephonyManager.SIM_ACTIVATION_STATE_UNKNOWN; -import static android.telephony.TelephonyManager.SIM_ACTIVATION_STATE_RESTRICTED; -import static android.telephony.TelephonyManager.SIM_ACTIVATION_STATE_ACTIVATING; public class SimActivationTracker { /** diff --git a/src/java/com/android/internal/telephony/SmsBroadcastUndelivered.java b/src/java/com/android/internal/telephony/SmsBroadcastUndelivered.java index 6afc865344..445b0effe8 100644 --- a/src/java/com/android/internal/telephony/SmsBroadcastUndelivered.java +++ b/src/java/com/android/internal/telephony/SmsBroadcastUndelivered.java @@ -27,12 +27,12 @@ import android.database.SQLException; import android.os.PersistableBundle; import android.os.UserManager; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.telephony.SubscriptionManager; import com.android.internal.telephony.cdma.CdmaInboundSmsHandler; import com.android.internal.telephony.gsm.GsmInboundSmsHandler; import com.android.internal.telephony.metrics.TelephonyMetrics; +import com.android.telephony.Rlog; import java.util.HashMap; import java.util.HashSet; diff --git a/src/java/com/android/internal/telephony/SmsController.java b/src/java/com/android/internal/telephony/SmsController.java index ef740c4de1..6c71690e0d 100644 --- a/src/java/com/android/internal/telephony/SmsController.java +++ b/src/java/com/android/internal/telephony/SmsController.java @@ -33,13 +33,13 @@ import android.os.Bundle; import android.os.ServiceManager; import android.provider.Telephony.Sms.Intents; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.telephony.SmsManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/SmsDispatchersController.java b/src/java/com/android/internal/telephony/SmsDispatchersController.java index 66b87096ed..e9ea3d9b71 100644 --- a/src/java/com/android/internal/telephony/SmsDispatchersController.java +++ b/src/java/com/android/internal/telephony/SmsDispatchersController.java @@ -36,7 +36,6 @@ import android.os.Message; import android.os.UserManager; import android.provider.Telephony.Sms; import android.provider.Telephony.Sms.Intents; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.SmsManager; import android.telephony.SmsMessage; @@ -47,6 +46,7 @@ import com.android.internal.telephony.cdma.CdmaInboundSmsHandler; import com.android.internal.telephony.cdma.CdmaSMSDispatcher; import com.android.internal.telephony.gsm.GsmInboundSmsHandler; import com.android.internal.telephony.gsm.GsmSMSDispatcher; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/SmsPermissions.java b/src/java/com/android/internal/telephony/SmsPermissions.java index 5590ce689f..02ecdf407d 100644 --- a/src/java/com/android/internal/telephony/SmsPermissions.java +++ b/src/java/com/android/internal/telephony/SmsPermissions.java @@ -24,9 +24,10 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.Binder; import android.service.carrier.CarrierMessagingService; -import android.telephony.Rlog; import android.util.Log; +import com.android.telephony.Rlog; + /** * Permissions checks for SMS functionality */ diff --git a/src/java/com/android/internal/telephony/SmsStorageMonitor.java b/src/java/com/android/internal/telephony/SmsStorageMonitor.java index fe06f633ea..9eb43da3e5 100755 --- a/src/java/com/android/internal/telephony/SmsStorageMonitor.java +++ b/src/java/com/android/internal/telephony/SmsStorageMonitor.java @@ -26,9 +26,10 @@ import android.os.Handler; import android.os.Message; import android.os.PowerManager; import android.provider.Telephony.Sms.Intents; -import android.telephony.Rlog; import android.telephony.SubscriptionManager; +import com.android.telephony.Rlog; + /** * Monitors the device and ICC storage, and sends the appropriate events. * diff --git a/src/java/com/android/internal/telephony/SmsUsageMonitor.java b/src/java/com/android/internal/telephony/SmsUsageMonitor.java index 2a9d89590c..28e674b463 100644 --- a/src/java/com/android/internal/telephony/SmsUsageMonitor.java +++ b/src/java/com/android/internal/telephony/SmsUsageMonitor.java @@ -29,13 +29,13 @@ import android.os.Process; import android.os.UserHandle; import android.provider.Settings; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.telephony.SmsManager; import android.util.AtomicFile; import android.util.Xml; import com.android.internal.telephony.util.XmlUtils; import com.android.internal.util.FastXmlSerializer; +import com.android.telephony.Rlog; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/src/java/com/android/internal/telephony/SubscriptionController.java b/src/java/com/android/internal/telephony/SubscriptionController.java index 5c06ee98c5..79a731784b 100644 --- a/src/java/com/android/internal/telephony/SubscriptionController.java +++ b/src/java/com/android/internal/telephony/SubscriptionController.java @@ -43,7 +43,6 @@ import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; import android.telephony.CarrierConfigManager; import android.telephony.RadioAccessFamily; -import android.telephony.Rlog; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager.SimDisplayNameSource; @@ -64,6 +63,7 @@ import com.android.internal.telephony.uicc.UiccCard; import com.android.internal.telephony.uicc.UiccController; import com.android.internal.telephony.util.ArrayUtils; import com.android.internal.telephony.util.TelephonyUtils; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/TelephonyCapabilities.java b/src/java/com/android/internal/telephony/TelephonyCapabilities.java index 66f805b74e..f2f7ddcb53 100644 --- a/src/java/com/android/internal/telephony/TelephonyCapabilities.java +++ b/src/java/com/android/internal/telephony/TelephonyCapabilities.java @@ -17,7 +17,8 @@ package com.android.internal.telephony; import android.compat.annotation.UnsupportedAppUsage; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; /** * Utilities that check if the phone supports specified capabilities. diff --git a/src/java/com/android/internal/telephony/TelephonyComponentFactory.java b/src/java/com/android/internal/telephony/TelephonyComponentFactory.java index bd9b338d50..b84a407fd9 100644 --- a/src/java/com/android/internal/telephony/TelephonyComponentFactory.java +++ b/src/java/com/android/internal/telephony/TelephonyComponentFactory.java @@ -30,7 +30,6 @@ import android.system.Os; import android.system.OsConstants; import android.system.StructStatVfs; import android.telephony.AccessNetworkConstants.TransportType; -import android.telephony.Rlog; import android.text.TextUtils; import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager; @@ -46,6 +45,7 @@ import com.android.internal.telephony.nitz.NewNitzStateMachineImpl; import com.android.internal.telephony.uicc.IccCardStatus; import com.android.internal.telephony.uicc.UiccCard; import com.android.internal.telephony.uicc.UiccProfile; +import com.android.telephony.Rlog; import dalvik.system.PathClassLoader; @@ -60,8 +60,6 @@ import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; - - /** * This class has one-line methods to instantiate objects only. The purpose is to make code * unit-test friendly and use this class as a way to do dependency injection. Instantiating objects diff --git a/src/java/com/android/internal/telephony/TelephonyDevController.java b/src/java/com/android/internal/telephony/TelephonyDevController.java index 3cda4179e7..a4672833b6 100644 --- a/src/java/com/android/internal/telephony/TelephonyDevController.java +++ b/src/java/com/android/internal/telephony/TelephonyDevController.java @@ -17,20 +17,14 @@ package com.android.internal.telephony; import android.content.res.Resources; -import com.android.internal.telephony.*; -import android.telephony.TelephonyManager; - import android.os.AsyncResult; -import android.telephony.Rlog; -import java.util.BitSet; -import java.util.List; -import java.util.ArrayList; -import android.text.TextUtils; import android.os.Handler; import android.os.Message; -import android.os.Registrant; -import android.os.RegistrantList; -import android.telephony.ServiceState; + +import com.android.telephony.Rlog; + +import java.util.ArrayList; +import java.util.List; /** * TelephonyDevController - provides a unified view of the diff --git a/src/java/com/android/internal/telephony/TelephonyTester.java b/src/java/com/android/internal/telephony/TelephonyTester.java index 52e01499f5..b8288aec30 100644 --- a/src/java/com/android/internal/telephony/TelephonyTester.java +++ b/src/java/com/android/internal/telephony/TelephonyTester.java @@ -24,7 +24,6 @@ import android.net.Uri; import android.os.BadParcelableException; import android.os.Bundle; import android.telephony.AccessNetworkConstants; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.TelephonyManager; import android.telephony.ims.ImsCallProfile; @@ -39,6 +38,7 @@ import com.android.internal.telephony.imsphone.ImsPhone; import com.android.internal.telephony.imsphone.ImsPhoneCall; import com.android.internal.telephony.test.TestConferenceEventPackageParser; import com.android.internal.telephony.util.TelephonyUtils; +import com.android.telephony.Rlog; import java.io.File; import java.io.FileInputStream; diff --git a/src/java/com/android/internal/telephony/UiccPhoneBookController.java b/src/java/com/android/internal/telephony/UiccPhoneBookController.java index 482f34008b..733c445e4c 100644 --- a/src/java/com/android/internal/telephony/UiccPhoneBookController.java +++ b/src/java/com/android/internal/telephony/UiccPhoneBookController.java @@ -20,10 +20,9 @@ package com.android.internal.telephony; import android.compat.annotation.UnsupportedAppUsage; import android.os.ServiceManager; -import android.telephony.Rlog; -import com.android.internal.telephony.IIccPhoneBook; import com.android.internal.telephony.uicc.AdnRecord; +import com.android.telephony.Rlog; import java.util.List; diff --git a/src/java/com/android/internal/telephony/WakeLockStateMachine.java b/src/java/com/android/internal/telephony/WakeLockStateMachine.java index 5cad74374b..eab9b8e766 100644 --- a/src/java/com/android/internal/telephony/WakeLockStateMachine.java +++ b/src/java/com/android/internal/telephony/WakeLockStateMachine.java @@ -22,11 +22,11 @@ import android.content.Context; import android.content.Intent; import android.os.Message; import android.os.PowerManager; -import android.telephony.Rlog; import com.android.internal.telephony.util.TelephonyUtils; import com.android.internal.util.State; import com.android.internal.util.StateMachine; +import com.android.telephony.Rlog; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/java/com/android/internal/telephony/WapPushOverSms.java b/src/java/com/android/internal/telephony/WapPushOverSms.java index bd3c442083..3944f775bb 100755 --- a/src/java/com/android/internal/telephony/WapPushOverSms.java +++ b/src/java/com/android/internal/telephony/WapPushOverSms.java @@ -47,13 +47,13 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.Telephony; import android.provider.Telephony.Sms.Intents; -import android.telephony.Rlog; import android.telephony.SmsManager; import android.telephony.SubscriptionManager; import android.text.TextUtils; import android.util.Log; import com.android.internal.telephony.uicc.IccUtils; +import com.android.telephony.Rlog; import com.google.android.mms.MmsException; import com.google.android.mms.pdu.DeliveryInd; diff --git a/src/java/com/android/internal/telephony/cat/CatLog.java b/src/java/com/android/internal/telephony/cat/CatLog.java index f41dc60204..62bdf4e2b1 100644 --- a/src/java/com/android/internal/telephony/cat/CatLog.java +++ b/src/java/com/android/internal/telephony/cat/CatLog.java @@ -17,7 +17,8 @@ package com.android.internal.telephony.cat; import android.compat.annotation.UnsupportedAppUsage; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; public abstract class CatLog { static final boolean DEBUG = true; diff --git a/src/java/com/android/internal/telephony/cat/ComprehensionTlv.java b/src/java/com/android/internal/telephony/cat/ComprehensionTlv.java index 568c7c0173..3651a40cd2 100644 --- a/src/java/com/android/internal/telephony/cat/ComprehensionTlv.java +++ b/src/java/com/android/internal/telephony/cat/ComprehensionTlv.java @@ -17,12 +17,12 @@ package com.android.internal.telephony.cat; import android.compat.annotation.UnsupportedAppUsage; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.List; - /** * Class for representing COMPREHENSION-TLV objects. * diff --git a/src/java/com/android/internal/telephony/cdma/CdmaCallWaitingNotification.java b/src/java/com/android/internal/telephony/cdma/CdmaCallWaitingNotification.java index b6ca02dfe6..79c4d3503e 100644 --- a/src/java/com/android/internal/telephony/cdma/CdmaCallWaitingNotification.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaCallWaitingNotification.java @@ -17,9 +17,9 @@ package com.android.internal.telephony.cdma; import android.compat.annotation.UnsupportedAppUsage; -import android.telephony.Rlog; import com.android.internal.telephony.PhoneConstants; +import com.android.telephony.Rlog; /** * Represents a Supplementary Service Notification received from the network. diff --git a/src/java/com/android/internal/telephony/cdma/CdmaMmiCode.java b/src/java/com/android/internal/telephony/cdma/CdmaMmiCode.java index e5931153f1..7a42b00b56 100644 --- a/src/java/com/android/internal/telephony/cdma/CdmaMmiCode.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaMmiCode.java @@ -22,7 +22,6 @@ import android.os.AsyncResult; import android.os.Handler; import android.os.Message; import android.os.ResultReceiver; -import android.telephony.Rlog; import com.android.internal.telephony.CommandException; import com.android.internal.telephony.GsmCdmaPhone; @@ -30,6 +29,7 @@ import com.android.internal.telephony.MmiCode; import com.android.internal.telephony.Phone; import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState; import com.android.internal.telephony.uicc.UiccCardApplication; +import com.android.telephony.Rlog; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java b/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java index ad46e54b73..3e60612727 100644 --- a/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java @@ -20,7 +20,6 @@ import static com.android.internal.telephony.SmsResponse.NO_ERROR_CODE; import android.compat.annotation.UnsupportedAppUsage; import android.os.Message; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.TelephonyManager; import android.util.Pair; @@ -35,7 +34,7 @@ import com.android.internal.telephony.SmsDispatchersController; import com.android.internal.telephony.SmsHeader; import com.android.internal.telephony.SmsMessageBase; import com.android.internal.telephony.util.SMSDispatcherUtil; - +import com.android.telephony.Rlog; public class CdmaSMSDispatcher extends SMSDispatcher { private static final String TAG = "CdmaSMSDispatcher"; diff --git a/src/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java b/src/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java index 1380c58364..b261dc5307 100644 --- a/src/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java @@ -24,10 +24,10 @@ import android.os.Message; import android.os.Registrant; import android.os.RegistrantList; import android.provider.Settings; -import android.telephony.Rlog; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.Phone; +import com.android.telephony.Rlog; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/java/com/android/internal/telephony/cdma/EriManager.java b/src/java/com/android/internal/telephony/cdma/EriManager.java index 782c6b5695..8c67149375 100644 --- a/src/java/com/android/internal/telephony/cdma/EriManager.java +++ b/src/java/com/android/internal/telephony/cdma/EriManager.java @@ -22,11 +22,11 @@ import android.content.res.Resources; import android.content.res.XmlResourceParser; import android.os.PersistableBundle; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.util.Xml; import com.android.internal.telephony.Phone; import com.android.internal.telephony.util.XmlUtils; +import com.android.telephony.Rlog; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/src/java/com/android/internal/telephony/cdnr/CarrierConfigEfData.java b/src/java/com/android/internal/telephony/cdnr/CarrierConfigEfData.java index b17b492e65..faa5e1f73d 100644 --- a/src/java/com/android/internal/telephony/cdnr/CarrierConfigEfData.java +++ b/src/java/com/android/internal/telephony/cdnr/CarrierConfigEfData.java @@ -19,12 +19,12 @@ package com.android.internal.telephony.cdnr; import android.annotation.NonNull; import android.os.PersistableBundle; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.text.TextUtils; import com.android.internal.telephony.uicc.IccRecords; import com.android.internal.telephony.uicc.IccRecords.OperatorPlmnInfo; import com.android.internal.telephony.uicc.IccRecords.PlmnNetworkName; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java b/src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java index b47576737e..dad9985e33 100644 --- a/src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java +++ b/src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java @@ -32,7 +32,6 @@ import android.content.Context; import android.content.res.Resources; import android.os.PersistableBundle; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.text.TextUtils; import android.util.LocalLog; @@ -49,6 +48,7 @@ import com.android.internal.telephony.uicc.IccRecords.PlmnNetworkName; import com.android.internal.telephony.uicc.RuimRecords; import com.android.internal.telephony.uicc.SIMRecords; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.util.Arrays; import java.util.Collections; diff --git a/src/java/com/android/internal/telephony/dataconnection/AccessNetworksManager.java b/src/java/com/android/internal/telephony/dataconnection/AccessNetworksManager.java index bdbf395db8..477e3314a4 100644 --- a/src/java/com/android/internal/telephony/dataconnection/AccessNetworksManager.java +++ b/src/java/com/android/internal/telephony/dataconnection/AccessNetworksManager.java @@ -35,7 +35,6 @@ import android.os.UserHandle; import android.telephony.AccessNetworkConstants.AccessNetworkType; import android.telephony.Annotation.ApnType; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.telephony.data.ApnSetting; import android.telephony.data.IQualifiedNetworksService; import android.telephony.data.IQualifiedNetworksServiceCallback; @@ -45,6 +44,7 @@ import android.util.SparseArray; import com.android.internal.telephony.Phone; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.util.ArrayList; diff --git a/src/java/com/android/internal/telephony/dataconnection/ApnContext.java b/src/java/com/android/internal/telephony/dataconnection/ApnContext.java index f34542990d..e614249d92 100644 --- a/src/java/com/android/internal/telephony/dataconnection/ApnContext.java +++ b/src/java/com/android/internal/telephony/dataconnection/ApnContext.java @@ -22,7 +22,6 @@ import android.net.NetworkConfig; import android.net.NetworkRequest; import android.os.Message; import android.telephony.Annotation.ApnType; -import android.telephony.Rlog; import android.telephony.data.ApnSetting; import android.text.TextUtils; import android.util.LocalLog; @@ -35,6 +34,7 @@ import com.android.internal.telephony.RetryManager; import com.android.internal.telephony.dataconnection.DcTracker.ReleaseNetworkType; import com.android.internal.telephony.dataconnection.DcTracker.RequestNetworkType; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/dataconnection/ApnSettingUtils.java b/src/java/com/android/internal/telephony/dataconnection/ApnSettingUtils.java index 8403efae44..d072a681c9 100644 --- a/src/java/com/android/internal/telephony/dataconnection/ApnSettingUtils.java +++ b/src/java/com/android/internal/telephony/dataconnection/ApnSettingUtils.java @@ -20,12 +20,12 @@ import android.content.Context; import android.os.PersistableBundle; import android.telephony.Annotation.ApnType; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.telephony.data.ApnSetting; import android.util.Log; import com.android.internal.telephony.Phone; import com.android.internal.telephony.uicc.IccRecords; +import com.android.telephony.Rlog; import java.util.Arrays; import java.util.HashSet; diff --git a/src/java/com/android/internal/telephony/dataconnection/CellularDataService.java b/src/java/com/android/internal/telephony/dataconnection/CellularDataService.java index b7676b74e7..9392182fdc 100644 --- a/src/java/com/android/internal/telephony/dataconnection/CellularDataService.java +++ b/src/java/com/android/internal/telephony/dataconnection/CellularDataService.java @@ -22,7 +22,6 @@ import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; import android.os.Message; -import android.telephony.Rlog; import android.telephony.SubscriptionManager; import android.telephony.data.DataCallResponse; import android.telephony.data.DataProfile; @@ -31,6 +30,7 @@ import android.telephony.data.DataServiceCallback; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneFactory; +import com.android.telephony.Rlog; import java.util.HashMap; import java.util.List; diff --git a/src/java/com/android/internal/telephony/dataconnection/DataEnabledSettings.java b/src/java/com/android/internal/telephony/dataconnection/DataEnabledSettings.java index 16ec3d6ae2..f8a5a81bee 100644 --- a/src/java/com/android/internal/telephony/dataconnection/DataEnabledSettings.java +++ b/src/java/com/android/internal/telephony/dataconnection/DataEnabledSettings.java @@ -31,7 +31,6 @@ import android.sysprop.TelephonyProperties; import android.telephony.Annotation.CallState; import android.telephony.CarrierConfigManager; import android.telephony.PhoneStateListener; -import android.telephony.Rlog; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -43,6 +42,7 @@ import com.android.internal.telephony.GlobalSettingsHelper; import com.android.internal.telephony.MultiSimSettingController; import com.android.internal.telephony.Phone; import com.android.internal.telephony.SubscriptionController; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java b/src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java index 87854bcda0..a638e16ac7 100644 --- a/src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java +++ b/src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java @@ -43,7 +43,6 @@ import android.telephony.AccessNetworkConstants; import android.telephony.AccessNetworkConstants.TransportType; import android.telephony.AnomalyReporter; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.telephony.SubscriptionManager; import android.telephony.data.DataCallResponse; import android.telephony.data.DataProfile; @@ -56,6 +55,7 @@ import android.text.TextUtils; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneConfigurationManager; import com.android.internal.telephony.util.TelephonyUtils; +import com.android.telephony.Rlog; import java.util.HashSet; import java.util.List; diff --git a/src/java/com/android/internal/telephony/dataconnection/DcController.java b/src/java/com/android/internal/telephony/dataconnection/DcController.java index caaed64f89..e8115b00fa 100644 --- a/src/java/com/android/internal/telephony/dataconnection/DcController.java +++ b/src/java/com/android/internal/telephony/dataconnection/DcController.java @@ -27,7 +27,6 @@ import android.os.Message; import android.telephony.AccessNetworkConstants; import android.telephony.DataFailCause; import android.telephony.PhoneStateListener; -import android.telephony.Rlog; import android.telephony.TelephonyManager; import android.telephony.data.DataCallResponse; @@ -37,6 +36,7 @@ import com.android.internal.telephony.dataconnection.DataConnection.UpdateLinkPr import com.android.internal.telephony.util.TelephonyUtils; import com.android.internal.util.State; import com.android.internal.util.StateMachine; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/dataconnection/DcFailBringUp.java b/src/java/com/android/internal/telephony/dataconnection/DcFailBringUp.java index a68c7b4895..420340d50e 100644 --- a/src/java/com/android/internal/telephony/dataconnection/DcFailBringUp.java +++ b/src/java/com/android/internal/telephony/dataconnection/DcFailBringUp.java @@ -19,7 +19,8 @@ package com.android.internal.telephony.dataconnection; import android.content.Intent; import android.telephony.Annotation.DataFailureCause; import android.telephony.DataFailCause; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; /** * A package visible class for supporting testing failing bringUp commands. This diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTesterDeactivateAll.java b/src/java/com/android/internal/telephony/dataconnection/DcTesterDeactivateAll.java index 361934ac8d..f4b26b654a 100644 --- a/src/java/com/android/internal/telephony/dataconnection/DcTesterDeactivateAll.java +++ b/src/java/com/android/internal/telephony/dataconnection/DcTesterDeactivateAll.java @@ -21,10 +21,10 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Handler; -import android.telephony.Rlog; import com.android.internal.telephony.Phone; import com.android.internal.telephony.util.TelephonyUtils; +import com.android.telephony.Rlog; /** * To bring down all DC's send the following intent: diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTesterFailBringUpAll.java b/src/java/com/android/internal/telephony/dataconnection/DcTesterFailBringUpAll.java index 74f0e2bbf1..ba07e12d61 100644 --- a/src/java/com/android/internal/telephony/dataconnection/DcTesterFailBringUpAll.java +++ b/src/java/com/android/internal/telephony/dataconnection/DcTesterFailBringUpAll.java @@ -22,10 +22,10 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Handler; import android.telephony.DataFailCause; -import android.telephony.Rlog; import com.android.internal.telephony.Phone; import com.android.internal.telephony.util.TelephonyUtils; +import com.android.telephony.Rlog; /** * A package level call that causes all DataConnection bringUp calls to fail a specific diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java index eb8d56fe80..fc5e573e45 100644 --- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java +++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java @@ -76,7 +76,6 @@ import android.telephony.DataFailCause; import android.telephony.NetworkRegistrationInfo; import android.telephony.PcoData; import android.telephony.PreciseDataConnectionState; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.ServiceState.RilRadioTechnology; import android.telephony.SubscriptionManager; @@ -115,6 +114,7 @@ import com.android.internal.telephony.uicc.UiccController; import com.android.internal.telephony.util.ArrayUtils; import com.android.internal.telephony.util.TelephonyUtils; import com.android.internal.util.AsyncChannel; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -133,6 +133,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; + /** * {@hide} */ diff --git a/src/java/com/android/internal/telephony/dataconnection/TelephonyNetworkFactory.java b/src/java/com/android/internal/telephony/dataconnection/TelephonyNetworkFactory.java index 8b0ecad8f1..0f80fced33 100644 --- a/src/java/com/android/internal/telephony/dataconnection/TelephonyNetworkFactory.java +++ b/src/java/com/android/internal/telephony/dataconnection/TelephonyNetworkFactory.java @@ -29,7 +29,6 @@ import android.os.Looper; import android.os.Message; import android.telephony.AccessNetworkConstants; import android.telephony.Annotation.ApnType; -import android.telephony.Rlog; import android.telephony.SubscriptionManager; import android.telephony.data.ApnSetting; import android.util.LocalLog; @@ -42,6 +41,7 @@ import com.android.internal.telephony.dataconnection.DcTracker.ReleaseNetworkTyp import com.android.internal.telephony.dataconnection.DcTracker.RequestNetworkType; import com.android.internal.telephony.dataconnection.TransportManager.HandoverParams; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/dataconnection/TransportManager.java b/src/java/com/android/internal/telephony/dataconnection/TransportManager.java index 6a2af7ce7b..2bea93ecd9 100644 --- a/src/java/com/android/internal/telephony/dataconnection/TransportManager.java +++ b/src/java/com/android/internal/telephony/dataconnection/TransportManager.java @@ -28,7 +28,6 @@ import android.telephony.AccessNetworkConstants; import android.telephony.AccessNetworkConstants.AccessNetworkType; import android.telephony.Annotation.ApnType; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.telephony.data.ApnSetting; import android.util.LocalLog; import android.util.SparseArray; @@ -40,6 +39,7 @@ import com.android.internal.telephony.RIL; import com.android.internal.telephony.dataconnection.AccessNetworksManager.QualifiedNetworks; import com.android.internal.telephony.util.ArrayUtils; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java b/src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java index 7440e1dc1a..e574f5aa37 100644 --- a/src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java +++ b/src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java @@ -28,7 +28,6 @@ import android.os.PersistableBundle; import android.os.SystemProperties; import android.telephony.CarrierConfigManager; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.telephony.TelephonyManager; import android.telephony.emergency.EmergencyNumber; import android.telephony.emergency.EmergencyNumber.EmergencyCallRouting; @@ -48,6 +47,7 @@ import com.android.internal.telephony.metrics.TelephonyMetrics; import com.android.internal.util.IndentingPrintWriter; import com.android.phone.ecc.nano.ProtobufEccData; import com.android.phone.ecc.nano.ProtobufEccData.EccInfo; +import com.android.telephony.Rlog; import com.google.i18n.phonenumbers.ShortNumberInfo; diff --git a/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java b/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java index 0949389969..14dd1b56e5 100644 --- a/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java +++ b/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java @@ -37,7 +37,6 @@ import android.os.PersistableBundle; import android.os.ResultReceiver; import android.telephony.CarrierConfigManager; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.text.BidiFormatter; import android.text.SpannableStringBuilder; import android.text.TextDirectionHeuristics; @@ -55,6 +54,7 @@ import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState; import com.android.internal.telephony.uicc.IccRecords; import com.android.internal.telephony.uicc.UiccCardApplication; import com.android.internal.telephony.util.ArrayUtils; +import com.android.telephony.Rlog; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java b/src/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java index de7977b8b8..e4044d2e0b 100644 --- a/src/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java +++ b/src/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java @@ -22,7 +22,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.os.AsyncResult; import android.os.Message; import android.provider.Telephony.Sms.Intents; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.util.Pair; @@ -39,6 +38,7 @@ import com.android.internal.telephony.uicc.IccUtils; import com.android.internal.telephony.uicc.UiccCardApplication; import com.android.internal.telephony.uicc.UiccController; import com.android.internal.telephony.util.SMSDispatcherUtil; +import com.android.telephony.Rlog; import java.util.HashMap; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/java/com/android/internal/telephony/gsm/SsData.java b/src/java/com/android/internal/telephony/gsm/SsData.java index a5f67d8ac3..41fa45e770 100644 --- a/src/java/com/android/internal/telephony/gsm/SsData.java +++ b/src/java/com/android/internal/telephony/gsm/SsData.java @@ -19,11 +19,9 @@ package com.android.internal.telephony.gsm; -import android.telephony.Rlog; import com.android.internal.telephony.CallForwardInfo; import com.android.internal.telephony.GsmCdmaPhone; - -import java.util.ArrayList; +import com.android.telephony.Rlog; /** * See also RIL_StkCcUnsolSsResponse in include/telephony/ril.h diff --git a/src/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java b/src/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java index 91cbbf0103..5d088460ce 100644 --- a/src/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java +++ b/src/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java @@ -22,7 +22,6 @@ import android.os.Handler; import android.os.Message; import android.provider.Telephony.Sms.Intents; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.telephony.SmsManager; import com.android.internal.telephony.CommandsInterface; @@ -31,6 +30,7 @@ import com.android.internal.telephony.metrics.TelephonyMetrics; import com.android.internal.telephony.uicc.IccIoResult; import com.android.internal.telephony.uicc.IccUtils; import com.android.internal.telephony.uicc.UsimServiceTable; +import com.android.telephony.Rlog; /** * Handler for SMS-PP data download messages. diff --git a/src/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java b/src/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java index 7594d3b5bc..f6fc0690ed 100755 --- a/src/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java +++ b/src/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java @@ -20,7 +20,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.os.AsyncResult; import android.os.Handler; import android.os.Message; -import android.telephony.Rlog; import android.util.SparseArray; import android.util.SparseIntArray; @@ -29,6 +28,7 @@ import com.android.internal.telephony.uicc.AdnRecordCache; import com.android.internal.telephony.uicc.IccConstants; import com.android.internal.telephony.uicc.IccFileHandler; import com.android.internal.telephony.uicc.IccUtils; +import com.android.telephony.Rlog; import java.util.ArrayList; diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhone.java b/src/java/com/android/internal/telephony/imsphone/ImsPhone.java index 275b428a7e..87d7e83d76 100644 --- a/src/java/com/android/internal/telephony/imsphone/ImsPhone.java +++ b/src/java/com/android/internal/telephony/imsphone/ImsPhone.java @@ -69,7 +69,6 @@ import android.telephony.AccessNetworkConstants; import android.telephony.CarrierConfigManager; import android.telephony.NetworkRegistrationInfo; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -117,6 +116,7 @@ import com.android.internal.telephony.nano.TelephonyProto.ImsConnectionState; import com.android.internal.telephony.uicc.IccRecords; import com.android.internal.telephony.util.NotificationChannelController; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneBase.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneBase.java index d2da8d09cc..1211916a54 100644 --- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneBase.java +++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneBase.java @@ -25,7 +25,6 @@ import android.os.RegistrantList; import android.sysprop.TelephonyProperties; import android.telephony.CallQuality; import android.telephony.NetworkScanRequest; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.ims.ImsReasonInfo; @@ -43,6 +42,7 @@ import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneNotifier; import com.android.internal.telephony.dataconnection.DataConnection; import com.android.internal.telephony.uicc.IccFileHandler; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.List; diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCall.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCall.java index 1a72b7ed8b..c9e50968dd 100644 --- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCall.java +++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCall.java @@ -18,7 +18,6 @@ package com.android.internal.telephony.imsphone; import android.compat.annotation.UnsupportedAppUsage; import android.telephony.DisconnectCause; -import android.telephony.Rlog; import android.telephony.ims.ImsStreamMediaProfile; import android.util.Log; @@ -30,6 +29,7 @@ import com.android.internal.telephony.Call; import com.android.internal.telephony.CallStateException; import com.android.internal.telephony.Connection; import com.android.internal.telephony.Phone; +import com.android.telephony.Rlog; import java.util.List; diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java index 20935ea401..5cf5531b0b 100644 --- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java +++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java @@ -50,7 +50,6 @@ import android.telephony.CallQuality; import android.telephony.CarrierConfigManager; import android.telephony.DisconnectCause; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; @@ -109,6 +108,7 @@ import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession; import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession.Event.ImsCommand; import com.android.internal.util.IndentingPrintWriter; import com.android.server.net.NetworkStatsService; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java index 32f4b4d6db..c29f45fc24 100644 --- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java +++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java @@ -33,7 +33,6 @@ import android.telecom.VideoProfile; import android.telephony.CarrierConfigManager; import android.telephony.DisconnectCause; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.TelephonyManager; import android.telephony.ims.ImsCallProfile; @@ -50,6 +49,7 @@ import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.UUSInfo; import com.android.internal.telephony.emergency.EmergencyNumberTracker; import com.android.internal.telephony.metrics.TelephonyMetrics; +import com.android.telephony.Rlog; import java.util.Objects; diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneFactory.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneFactory.java index 9f81a69ce4..8f82328aba 100644 --- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneFactory.java +++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneFactory.java @@ -16,11 +16,11 @@ package com.android.internal.telephony.imsphone; +import android.content.Context; + import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneNotifier; - -import android.content.Context; -import android.telephony.Rlog; +import com.android.telephony.Rlog; /** * {@hide} diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java index 6d077c27a6..e14b075e11 100644 --- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java +++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java @@ -35,7 +35,6 @@ import android.os.Handler; import android.os.Message; import android.os.ResultReceiver; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.telephony.ims.ImsCallForwardInfo; import android.telephony.ims.ImsReasonInfo; import android.telephony.ims.ImsSsData; @@ -53,6 +52,7 @@ import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.MmiCode; import com.android.internal.telephony.Phone; import com.android.internal.telephony.uicc.IccRecords; +import com.android.telephony.Rlog; import java.util.Arrays; import java.util.List; diff --git a/src/java/com/android/internal/telephony/imsphone/ImsRttTextHandler.java b/src/java/com/android/internal/telephony/imsphone/ImsRttTextHandler.java index eff2499792..3955ea7e3a 100644 --- a/src/java/com/android/internal/telephony/imsphone/ImsRttTextHandler.java +++ b/src/java/com/android/internal/telephony/imsphone/ImsRttTextHandler.java @@ -20,9 +20,9 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.telecom.Connection; -import android.telephony.Rlog; import com.android.internal.annotations.VisibleForTesting; +import com.android.telephony.Rlog; import java.io.IOException; import java.nio.channels.ClosedByInterruptException; diff --git a/src/java/com/android/internal/telephony/metrics/CallQualityMetrics.java b/src/java/com/android/internal/telephony/metrics/CallQualityMetrics.java index 55ac225ab9..cf98acb871 100644 --- a/src/java/com/android/internal/telephony/metrics/CallQualityMetrics.java +++ b/src/java/com/android/internal/telephony/metrics/CallQualityMetrics.java @@ -21,7 +21,6 @@ import static com.android.internal.telephony.metrics.TelephonyMetrics.toCallQual import android.telephony.CallQuality; import android.telephony.CellInfo; import android.telephony.CellSignalStrengthLte; -import android.telephony.Rlog; import android.telephony.SignalStrength; import android.util.Pair; @@ -29,6 +28,7 @@ import com.android.internal.telephony.Phone; import com.android.internal.telephony.ServiceStateTracker; import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession; import com.android.internal.telephony.util.TelephonyUtils; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.Collections; diff --git a/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java b/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java index 5856fbdee3..5d1ab37b15 100644 --- a/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java +++ b/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java @@ -46,7 +46,6 @@ import android.telephony.AccessNetworkConstants; import android.telephony.CallQuality; import android.telephony.DisconnectCause; import android.telephony.NetworkRegistrationInfo; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.SmsManager; import android.telephony.SmsMessage; @@ -111,6 +110,7 @@ import com.android.internal.telephony.nano.TelephonyProto.TimeInterval; import com.android.internal.telephony.protobuf.nano.MessageNano; import com.android.internal.telephony.util.TelephonyUtils; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/nitz/NewNitzStateMachineImpl.java b/src/java/com/android/internal/telephony/nitz/NewNitzStateMachineImpl.java index d2e5f55fa5..619bf7b4aa 100644 --- a/src/java/com/android/internal/telephony/nitz/NewNitzStateMachineImpl.java +++ b/src/java/com/android/internal/telephony/nitz/NewNitzStateMachineImpl.java @@ -22,7 +22,6 @@ import android.app.timedetector.PhoneTimeSuggestion; import android.app.timezonedetector.PhoneTimeZoneSuggestion; import android.content.Context; import android.os.TimestampedValue; -import android.telephony.Rlog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.NitzData; @@ -30,6 +29,7 @@ import com.android.internal.telephony.NitzStateMachine; import com.android.internal.telephony.Phone; import com.android.internal.telephony.TimeZoneLookupHelper; import com.android.internal.util.IndentingPrintWriter; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/nitz/NitzSignalInputFilterPredicateFactory.java b/src/java/com/android/internal/telephony/nitz/NitzSignalInputFilterPredicateFactory.java index 4f4e2569e6..5c238b7548 100644 --- a/src/java/com/android/internal/telephony/nitz/NitzSignalInputFilterPredicateFactory.java +++ b/src/java/com/android/internal/telephony/nitz/NitzSignalInputFilterPredicateFactory.java @@ -22,12 +22,12 @@ import android.content.Context; import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.os.TimestampedValue; -import android.telephony.Rlog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.NitzData; import com.android.internal.telephony.NitzStateMachine.DeviceState; import com.android.internal.telephony.nitz.NewNitzStateMachineImpl.NitzSignalInputFilterPredicate; +import com.android.telephony.Rlog; import java.util.Arrays; import java.util.Objects; diff --git a/src/java/com/android/internal/telephony/nitz/TimeZoneSuggesterImpl.java b/src/java/com/android/internal/telephony/nitz/TimeZoneSuggesterImpl.java index 96adfe4b9e..c17c864ae9 100644 --- a/src/java/com/android/internal/telephony/nitz/TimeZoneSuggesterImpl.java +++ b/src/java/com/android/internal/telephony/nitz/TimeZoneSuggesterImpl.java @@ -22,7 +22,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.timezonedetector.PhoneTimeZoneSuggestion; import android.os.TimestampedValue; -import android.telephony.Rlog; import android.text.TextUtils; import android.timezone.CountryTimeZones.OffsetResult; @@ -32,6 +31,7 @@ import com.android.internal.telephony.NitzStateMachine.DeviceState; import com.android.internal.telephony.TimeZoneLookupHelper; import com.android.internal.telephony.TimeZoneLookupHelper.CountryResult; import com.android.internal.telephony.nitz.NewNitzStateMachineImpl.TimeZoneSuggester; +import com.android.telephony.Rlog; import java.util.Objects; diff --git a/src/java/com/android/internal/telephony/sip/SipConnectionBase.java b/src/java/com/android/internal/telephony/sip/SipConnectionBase.java index acf6d3632b..40e5203318 100644 --- a/src/java/com/android/internal/telephony/sip/SipConnectionBase.java +++ b/src/java/com/android/internal/telephony/sip/SipConnectionBase.java @@ -16,16 +16,15 @@ package com.android.internal.telephony.sip; +import android.os.SystemClock; +import android.telephony.PhoneNumberUtils; + import com.android.internal.telephony.Call; import com.android.internal.telephony.Connection; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.UUSInfo; - -import android.os.SystemClock; -import android.telephony.DisconnectCause; -import android.telephony.Rlog; -import android.telephony.PhoneNumberUtils; +import com.android.telephony.Rlog; abstract class SipConnectionBase extends Connection { private static final String LOG_TAG = "SipConnBase"; diff --git a/src/java/com/android/internal/telephony/sip/SipPhone.java b/src/java/com/android/internal/telephony/sip/SipPhone.java index c0145318f7..ea7aa3e031 100644 --- a/src/java/com/android/internal/telephony/sip/SipPhone.java +++ b/src/java/com/android/internal/telephony/sip/SipPhone.java @@ -30,7 +30,6 @@ import android.os.AsyncResult; import android.os.Message; import android.telephony.DisconnectCause; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.text.TextUtils; @@ -40,6 +39,7 @@ import com.android.internal.telephony.Connection; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneNotifier; +import com.android.telephony.Rlog; import java.text.ParseException; import java.util.List; diff --git a/src/java/com/android/internal/telephony/sip/SipPhoneBase.java b/src/java/com/android/internal/telephony/sip/SipPhoneBase.java index 85c97ea733..75aa1e49b0 100755 --- a/src/java/com/android/internal/telephony/sip/SipPhoneBase.java +++ b/src/java/com/android/internal/telephony/sip/SipPhoneBase.java @@ -25,7 +25,6 @@ import android.os.RegistrantList; import android.os.ResultReceiver; import android.sysprop.TelephonyProperties; import android.telephony.NetworkScanRequest; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.SignalStrength; @@ -39,6 +38,7 @@ import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneNotifier; import com.android.internal.telephony.uicc.IccFileHandler; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.List; diff --git a/src/java/com/android/internal/telephony/sip/SipPhoneFactory.java b/src/java/com/android/internal/telephony/sip/SipPhoneFactory.java index 3383bedfbe..42b7be73a4 100644 --- a/src/java/com/android/internal/telephony/sip/SipPhoneFactory.java +++ b/src/java/com/android/internal/telephony/sip/SipPhoneFactory.java @@ -16,11 +16,11 @@ package com.android.internal.telephony.sip; -import com.android.internal.telephony.PhoneNotifier; - import android.content.Context; import android.net.sip.SipProfile; -import android.telephony.Rlog; + +import com.android.internal.telephony.PhoneNotifier; +import com.android.telephony.Rlog; import java.text.ParseException; diff --git a/src/java/com/android/internal/telephony/uicc/AdnRecord.java b/src/java/com/android/internal/telephony/uicc/AdnRecord.java index bd99932d89..8ab772244d 100644 --- a/src/java/com/android/internal/telephony/uicc/AdnRecord.java +++ b/src/java/com/android/internal/telephony/uicc/AdnRecord.java @@ -20,14 +20,13 @@ import android.compat.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.text.TextUtils; import com.android.internal.telephony.GsmAlphabet; +import com.android.telephony.Rlog; import java.util.Arrays; - /** * * Used to load or store ADNs (Abbreviated Dialing Numbers). diff --git a/src/java/com/android/internal/telephony/uicc/AdnRecordLoader.java b/src/java/com/android/internal/telephony/uicc/AdnRecordLoader.java index 64b47b513f..a23248ccb4 100644 --- a/src/java/com/android/internal/telephony/uicc/AdnRecordLoader.java +++ b/src/java/com/android/internal/telephony/uicc/AdnRecordLoader.java @@ -21,7 +21,8 @@ import android.os.AsyncResult; import android.os.Handler; import android.os.Looper; import android.os.Message; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; import java.util.ArrayList; diff --git a/src/java/com/android/internal/telephony/uicc/AnswerToReset.java b/src/java/com/android/internal/telephony/uicc/AnswerToReset.java index 6fd7c68b6d..9ded7d652f 100644 --- a/src/java/com/android/internal/telephony/uicc/AnswerToReset.java +++ b/src/java/com/android/internal/telephony/uicc/AnswerToReset.java @@ -17,10 +17,10 @@ package com.android.internal.telephony.uicc; import android.annotation.Nullable; -import android.telephony.Rlog; import android.util.ArrayMap; import com.android.internal.annotations.VisibleForTesting; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/uicc/CarrierTestOverride.java b/src/java/com/android/internal/telephony/uicc/CarrierTestOverride.java index d098cffaaa..da51848dab 100644 --- a/src/java/com/android/internal/telephony/uicc/CarrierTestOverride.java +++ b/src/java/com/android/internal/telephony/uicc/CarrierTestOverride.java @@ -17,10 +17,10 @@ package com.android.internal.telephony.uicc; import android.os.Environment; -import android.telephony.Rlog; import android.util.Xml; import com.android.internal.telephony.util.XmlUtils; +import com.android.telephony.Rlog; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/src/java/com/android/internal/telephony/uicc/CsimFileHandler.java b/src/java/com/android/internal/telephony/uicc/CsimFileHandler.java index e45afa9660..c5dd05c0d8 100644 --- a/src/java/com/android/internal/telephony/uicc/CsimFileHandler.java +++ b/src/java/com/android/internal/telephony/uicc/CsimFileHandler.java @@ -16,9 +16,8 @@ package com.android.internal.telephony.uicc; -import android.telephony.Rlog; - import com.android.internal.telephony.CommandsInterface; +import com.android.telephony.Rlog; /** * {@hide} diff --git a/src/java/com/android/internal/telephony/uicc/IccCardApplicationStatus.java b/src/java/com/android/internal/telephony/uicc/IccCardApplicationStatus.java index 06a60b3f87..a47cc005e0 100644 --- a/src/java/com/android/internal/telephony/uicc/IccCardApplicationStatus.java +++ b/src/java/com/android/internal/telephony/uicc/IccCardApplicationStatus.java @@ -17,10 +17,9 @@ package com.android.internal.telephony.uicc; import android.compat.annotation.UnsupportedAppUsage; -import android.telephony.Rlog; import com.android.internal.telephony.uicc.IccCardStatus.PinState; - +import com.android.telephony.Rlog; /** * See also RIL_AppStatus in include/telephony/ril.h diff --git a/src/java/com/android/internal/telephony/uicc/IccRecords.java b/src/java/com/android/internal/telephony/uicc/IccRecords.java index 47f2d5e1dc..139fffbc89 100644 --- a/src/java/com/android/internal/telephony/uicc/IccRecords.java +++ b/src/java/com/android/internal/telephony/uicc/IccRecords.java @@ -25,7 +25,6 @@ import android.os.Handler; import android.os.Message; import android.os.Registrant; import android.os.RegistrantList; -import android.telephony.Rlog; import android.telephony.SubscriptionInfo; import android.telephony.TelephonyManager; import android.text.TextUtils; @@ -34,6 +33,7 @@ import android.util.Pair; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.MccTable; import com.android.internal.telephony.util.ArrayUtils; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/uicc/IccServiceTable.java b/src/java/com/android/internal/telephony/uicc/IccServiceTable.java index b811d5c46d..fe6e433000 100644 --- a/src/java/com/android/internal/telephony/uicc/IccServiceTable.java +++ b/src/java/com/android/internal/telephony/uicc/IccServiceTable.java @@ -17,7 +17,8 @@ package com.android.internal.telephony.uicc; import android.compat.annotation.UnsupportedAppUsage; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; /** * Wrapper class for an ICC EF containing a bit field of enabled services. diff --git a/src/java/com/android/internal/telephony/uicc/IsimFileHandler.java b/src/java/com/android/internal/telephony/uicc/IsimFileHandler.java index 6fe16c9f59..fe900cb387 100644 --- a/src/java/com/android/internal/telephony/uicc/IsimFileHandler.java +++ b/src/java/com/android/internal/telephony/uicc/IsimFileHandler.java @@ -16,9 +16,8 @@ package com.android.internal.telephony.uicc; -import android.telephony.Rlog; - import com.android.internal.telephony.CommandsInterface; +import com.android.telephony.Rlog; /** * {@hide} diff --git a/src/java/com/android/internal/telephony/uicc/IsimUiccRecords.java b/src/java/com/android/internal/telephony/uicc/IsimUiccRecords.java index 766668ce60..73991b92d3 100644 --- a/src/java/com/android/internal/telephony/uicc/IsimUiccRecords.java +++ b/src/java/com/android/internal/telephony/uicc/IsimUiccRecords.java @@ -21,11 +21,11 @@ import android.content.Context; import android.content.Intent; import android.os.AsyncResult; import android.os.Message; -import android.telephony.Rlog; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.gsm.SimTlv; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/uicc/PlmnActRecord.java b/src/java/com/android/internal/telephony/uicc/PlmnActRecord.java index 4d0b4849f6..61352d9dfc 100755 --- a/src/java/com/android/internal/telephony/uicc/PlmnActRecord.java +++ b/src/java/com/android/internal/telephony/uicc/PlmnActRecord.java @@ -19,7 +19,8 @@ package com.android.internal.telephony.uicc; import android.annotation.IntDef; import android.os.Parcel; import android.os.Parcelable; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/java/com/android/internal/telephony/uicc/RuimFileHandler.java b/src/java/com/android/internal/telephony/uicc/RuimFileHandler.java index 58e939fa00..2323b5a4bb 100644 --- a/src/java/com/android/internal/telephony/uicc/RuimFileHandler.java +++ b/src/java/com/android/internal/telephony/uicc/RuimFileHandler.java @@ -17,9 +17,9 @@ package com.android.internal.telephony.uicc; import android.os.*; -import android.telephony.Rlog; import com.android.internal.telephony.CommandsInterface; +import com.android.telephony.Rlog; /** * {@hide} diff --git a/src/java/com/android/internal/telephony/uicc/RuimRecords.java b/src/java/com/android/internal/telephony/uicc/RuimRecords.java index 09516789d1..d08575f390 100644 --- a/src/java/com/android/internal/telephony/uicc/RuimRecords.java +++ b/src/java/com/android/internal/telephony/uicc/RuimRecords.java @@ -22,7 +22,6 @@ import android.content.res.Resources; import android.os.AsyncResult; import android.os.Message; import android.sysprop.TelephonyProperties; -import android.telephony.Rlog; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.text.TextUtils; @@ -35,6 +34,7 @@ import com.android.internal.telephony.SubscriptionController; import com.android.internal.telephony.cdma.sms.UserData; import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType; import com.android.internal.util.BitwiseInputStream; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/uicc/SIMFileHandler.java b/src/java/com/android/internal/telephony/uicc/SIMFileHandler.java index 3be0c9914f..be165c1bfc 100644 --- a/src/java/com/android/internal/telephony/uicc/SIMFileHandler.java +++ b/src/java/com/android/internal/telephony/uicc/SIMFileHandler.java @@ -16,9 +16,8 @@ package com.android.internal.telephony.uicc; -import android.telephony.Rlog; - import com.android.internal.telephony.CommandsInterface; +import com.android.telephony.Rlog; /** * {@hide} diff --git a/src/java/com/android/internal/telephony/uicc/SIMRecords.java b/src/java/com/android/internal/telephony/uicc/SIMRecords.java index baa56832fd..8839e0483d 100644 --- a/src/java/com/android/internal/telephony/uicc/SIMRecords.java +++ b/src/java/com/android/internal/telephony/uicc/SIMRecords.java @@ -24,7 +24,6 @@ import android.os.Message; import android.os.PersistableBundle; import android.telephony.CarrierConfigManager; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import android.telephony.SmsMessage; import android.telephony.SubscriptionInfo; import android.text.TextUtils; @@ -36,6 +35,7 @@ import com.android.internal.telephony.SmsConstants; import com.android.internal.telephony.SubscriptionController; import com.android.internal.telephony.gsm.SimTlv; import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/uicc/UiccCard.java b/src/java/com/android/internal/telephony/uicc/UiccCard.java index d06cdb0893..73e26a9083 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccCard.java +++ b/src/java/com/android/internal/telephony/uicc/UiccCard.java @@ -24,7 +24,6 @@ import android.content.pm.PackageManager; import android.content.pm.Signature; import android.os.Handler; import android.os.Message; -import android.telephony.Rlog; import android.telephony.TelephonyManager; import android.text.TextUtils; @@ -33,6 +32,7 @@ import com.android.internal.telephony.TelephonyComponentFactory; import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType; import com.android.internal.telephony.uicc.IccCardStatus.CardState; import com.android.internal.telephony.uicc.IccCardStatus.PinState; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/uicc/UiccCardApplication.java b/src/java/com/android/internal/telephony/uicc/UiccCardApplication.java index 592104677c..83fbb65347 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccCardApplication.java +++ b/src/java/com/android/internal/telephony/uicc/UiccCardApplication.java @@ -23,7 +23,6 @@ import android.os.Handler; import android.os.Message; import android.os.Registrant; import android.os.RegistrantList; -import android.telephony.Rlog; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.PhoneConstants; @@ -31,6 +30,7 @@ import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState; import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType; import com.android.internal.telephony.uicc.IccCardApplicationStatus.PersoSubState; import com.android.internal.telephony.uicc.IccCardStatus.PinState; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java b/src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java index 21776565ee..e1bc0b7d51 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java +++ b/src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java @@ -27,13 +27,13 @@ import android.os.AsyncResult; import android.os.Binder; import android.os.Handler; import android.os.Message; -import android.telephony.Rlog; import android.telephony.TelephonyManager; import android.telephony.UiccAccessRule; import android.text.TextUtils; import android.util.LocalLog; import com.android.internal.telephony.CommandException; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/uicc/UiccController.java b/src/java/com/android/internal/telephony/uicc/UiccController.java index 96c9d1b034..b3f6f79478 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccController.java +++ b/src/java/com/android/internal/telephony/uicc/UiccController.java @@ -35,7 +35,6 @@ import android.os.RegistrantList; import android.os.storage.StorageManager; import android.preference.PreferenceManager; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.telephony.TelephonyManager; import android.telephony.UiccCardInfo; import android.text.TextUtils; @@ -51,6 +50,7 @@ import com.android.internal.telephony.PhoneFactory; import com.android.internal.telephony.RadioConfig; import com.android.internal.telephony.SubscriptionInfoUpdater; import com.android.internal.telephony.uicc.euicc.EuiccCard; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/uicc/UiccPkcs15.java b/src/java/com/android/internal/telephony/uicc/UiccPkcs15.java index cc99ae9b8f..3513bb90ab 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccPkcs15.java +++ b/src/java/com/android/internal/telephony/uicc/UiccPkcs15.java @@ -19,9 +19,9 @@ package com.android.internal.telephony.uicc; import android.os.AsyncResult; import android.os.Handler; import android.os.Message; -import android.telephony.Rlog; import com.android.internal.telephony.uicc.UiccCarrierPrivilegeRules.TLV; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/uicc/UiccProfile.java b/src/java/com/android/internal/telephony/uicc/UiccProfile.java index 971c93a9e0..9ac21b0792 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccProfile.java +++ b/src/java/com/android/internal/telephony/uicc/UiccProfile.java @@ -38,7 +38,6 @@ import android.os.UserManager; import android.preference.PreferenceManager; import android.provider.Settings; import android.telephony.CarrierConfigManager; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; @@ -62,6 +61,7 @@ import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType; import com.android.internal.telephony.uicc.IccCardStatus.CardState; import com.android.internal.telephony.uicc.IccCardStatus.PinState; import com.android.internal.telephony.uicc.euicc.EuiccCard; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/uicc/UiccSlot.java b/src/java/com/android/internal/telephony/uicc/UiccSlot.java index 0c2c60b2e9..db0aeb78c1 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccSlot.java +++ b/src/java/com/android/internal/telephony/uicc/UiccSlot.java @@ -27,7 +27,6 @@ import android.os.Handler; import android.os.Message; import android.os.PowerManager; import android.os.UserHandle; -import android.telephony.Rlog; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.view.WindowManager; @@ -39,6 +38,7 @@ import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneFactory; import com.android.internal.telephony.uicc.IccCardStatus.CardState; import com.android.internal.telephony.uicc.euicc.EuiccCard; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/uicc/UsimFileHandler.java b/src/java/com/android/internal/telephony/uicc/UsimFileHandler.java index b120eb602d..ff8d63d5c1 100755 --- a/src/java/com/android/internal/telephony/uicc/UsimFileHandler.java +++ b/src/java/com/android/internal/telephony/uicc/UsimFileHandler.java @@ -16,10 +16,8 @@ package com.android.internal.telephony.uicc; -import android.telephony.Rlog; - import com.android.internal.telephony.CommandsInterface; -import com.android.internal.telephony.uicc.UiccCardApplication; +import com.android.telephony.Rlog; /** * {@hide} diff --git a/src/java/com/android/internal/telephony/uicc/VoiceMailConstants.java b/src/java/com/android/internal/telephony/uicc/VoiceMailConstants.java index 792c7dc610..b10b8758ad 100644 --- a/src/java/com/android/internal/telephony/uicc/VoiceMailConstants.java +++ b/src/java/com/android/internal/telephony/uicc/VoiceMailConstants.java @@ -18,10 +18,10 @@ package com.android.internal.telephony.uicc; import android.compat.annotation.UnsupportedAppUsage; import android.os.Environment; -import android.telephony.Rlog; import android.util.Xml; import com.android.internal.telephony.util.XmlUtils; +import com.android.telephony.Rlog; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/src/java/com/android/internal/telephony/uicc/euicc/EuiccCard.java b/src/java/com/android/internal/telephony/uicc/euicc/EuiccCard.java index 12f2ead852..bff29ff258 100644 --- a/src/java/com/android/internal/telephony/uicc/euicc/EuiccCard.java +++ b/src/java/com/android/internal/telephony/uicc/euicc/EuiccCard.java @@ -25,7 +25,6 @@ import android.os.Registrant; import android.os.RegistrantList; import android.service.carrier.CarrierIdentifier; import android.service.euicc.EuiccProfileInfo; -import android.telephony.Rlog; import android.telephony.SubscriptionInfo; import android.telephony.UiccAccessRule; import android.telephony.euicc.EuiccCardManager; @@ -53,6 +52,7 @@ import com.android.internal.telephony.uicc.euicc.apdu.RequestBuilder; import com.android.internal.telephony.uicc.euicc.apdu.RequestProvider; import com.android.internal.telephony.uicc.euicc.async.AsyncResultCallback; import com.android.internal.telephony.uicc.euicc.async.AsyncResultHelper; +import com.android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/java/com/android/internal/telephony/uicc/euicc/EuiccSpecVersion.java b/src/java/com/android/internal/telephony/uicc/euicc/EuiccSpecVersion.java index b0387165dc..9450bfc7fe 100644 --- a/src/java/com/android/internal/telephony/uicc/euicc/EuiccSpecVersion.java +++ b/src/java/com/android/internal/telephony/uicc/euicc/EuiccSpecVersion.java @@ -16,12 +16,11 @@ package com.android.internal.telephony.uicc.euicc; -import android.telephony.Rlog; - import com.android.internal.telephony.uicc.asn1.Asn1Decoder; import com.android.internal.telephony.uicc.asn1.Asn1Node; import com.android.internal.telephony.uicc.asn1.InvalidAsn1DataException; import com.android.internal.telephony.uicc.asn1.TagNotFoundException; +import com.android.telephony.Rlog; import java.util.Arrays; diff --git a/src/java/com/android/internal/telephony/uicc/euicc/apdu/ApduSender.java b/src/java/com/android/internal/telephony/uicc/euicc/apdu/ApduSender.java index 00b49457a4..8e7237e182 100644 --- a/src/java/com/android/internal/telephony/uicc/euicc/apdu/ApduSender.java +++ b/src/java/com/android/internal/telephony/uicc/euicc/apdu/ApduSender.java @@ -20,12 +20,12 @@ import android.annotation.Nullable; import android.os.Handler; import android.os.Looper; import android.telephony.IccOpenLogicalChannelResponse; -import android.telephony.Rlog; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.uicc.IccIoResult; import com.android.internal.telephony.uicc.euicc.async.AsyncResultCallback; import com.android.internal.telephony.uicc.euicc.async.AsyncResultHelper; +import com.android.telephony.Rlog; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/java/com/android/internal/telephony/uicc/euicc/apdu/CloseLogicalChannelInvocation.java b/src/java/com/android/internal/telephony/uicc/euicc/apdu/CloseLogicalChannelInvocation.java index edd89d6d6b..82ddb80d8e 100644 --- a/src/java/com/android/internal/telephony/uicc/euicc/apdu/CloseLogicalChannelInvocation.java +++ b/src/java/com/android/internal/telephony/uicc/euicc/apdu/CloseLogicalChannelInvocation.java @@ -18,11 +18,11 @@ package com.android.internal.telephony.uicc.euicc.apdu; import android.os.AsyncResult; import android.os.Message; -import android.telephony.Rlog; import com.android.internal.telephony.CommandException; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.uicc.euicc.async.AsyncMessageInvocation; +import com.android.telephony.Rlog; /** * Invokes {@link CommandsInterface#iccCloseLogicalChannel(int, Message)}. This takes a channel id diff --git a/src/java/com/android/internal/telephony/uicc/euicc/apdu/OpenLogicalChannelInvocation.java b/src/java/com/android/internal/telephony/uicc/euicc/apdu/OpenLogicalChannelInvocation.java index 15b0c43a73..caed9cfbf7 100644 --- a/src/java/com/android/internal/telephony/uicc/euicc/apdu/OpenLogicalChannelInvocation.java +++ b/src/java/com/android/internal/telephony/uicc/euicc/apdu/OpenLogicalChannelInvocation.java @@ -19,11 +19,11 @@ package com.android.internal.telephony.uicc.euicc.apdu; import android.os.AsyncResult; import android.os.Message; import android.telephony.IccOpenLogicalChannelResponse; -import android.telephony.Rlog; import com.android.internal.telephony.CommandException; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.uicc.euicc.async.AsyncMessageInvocation; +import com.android.telephony.Rlog; /** * Invokes {@link CommandsInterface#iccOpenLogicalChannel(String, int, Message)}. This takes AID diff --git a/src/java/com/android/internal/telephony/uicc/euicc/apdu/TransmitApduLogicalChannelInvocation.java b/src/java/com/android/internal/telephony/uicc/euicc/apdu/TransmitApduLogicalChannelInvocation.java index 296fe476a5..09de54a804 100644 --- a/src/java/com/android/internal/telephony/uicc/euicc/apdu/TransmitApduLogicalChannelInvocation.java +++ b/src/java/com/android/internal/telephony/uicc/euicc/apdu/TransmitApduLogicalChannelInvocation.java @@ -18,12 +18,12 @@ package com.android.internal.telephony.uicc.euicc.apdu; import android.os.AsyncResult; import android.os.Message; -import android.telephony.Rlog; import com.android.internal.telephony.CommandException; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.uicc.IccIoResult; import com.android.internal.telephony.uicc.euicc.async.AsyncMessageInvocation; +import com.android.telephony.Rlog; /** * Invokes {@link CommandsInterface#iccTransmitApduLogicalChannel(int, int, int, int, int, int, diff --git a/src/java/com/android/internal/telephony/uicc/euicc/async/AsyncResultCallback.java b/src/java/com/android/internal/telephony/uicc/euicc/async/AsyncResultCallback.java index b28e7e765f..58ab6bfa2c 100644 --- a/src/java/com/android/internal/telephony/uicc/euicc/async/AsyncResultCallback.java +++ b/src/java/com/android/internal/telephony/uicc/euicc/async/AsyncResultCallback.java @@ -16,7 +16,7 @@ package com.android.internal.telephony.uicc.euicc.async; -import android.telephony.Rlog; +import com.android.telephony.Rlog; /** * Class to deliver the returned value from an asynchronous call. Either {@link #onResult(Result)} diff --git a/src/java/com/android/internal/telephony/util/LocaleUtils.java b/src/java/com/android/internal/telephony/util/LocaleUtils.java index 755585b713..064b10dd85 100644 --- a/src/java/com/android/internal/telephony/util/LocaleUtils.java +++ b/src/java/com/android/internal/telephony/util/LocaleUtils.java @@ -18,10 +18,10 @@ package com.android.internal.telephony.util; import android.content.Context; import android.icu.util.ULocale; -import android.telephony.Rlog; import android.text.TextUtils; import com.android.internal.telephony.MccTable; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.Arrays; diff --git a/tests/telephonytests/src/com/android/internal/telephony/ModelInterpreter.java b/tests/telephonytests/src/com/android/internal/telephony/ModelInterpreter.java index 7499a7a834..ddb99d981e 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/ModelInterpreter.java +++ b/tests/telephonytests/src/com/android/internal/telephony/ModelInterpreter.java @@ -19,7 +19,8 @@ package com.android.internal.telephony.test; import android.compat.annotation.UnsupportedAppUsage; import android.os.HandlerThread; import android.os.Looper; -import android.telephony.Rlog; + +import com.android.telephony.Rlog; import java.io.IOException; import java.io.InputStream; diff --git a/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommands.java b/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommands.java index 26b9a16d18..3649ea4e4f 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommands.java +++ b/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommands.java @@ -43,7 +43,6 @@ import android.telephony.IccOpenLogicalChannelResponse; import android.telephony.ImsiEncryptionInfo; import android.telephony.NetworkRegistrationInfo; import android.telephony.NetworkScanRequest; -import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.SignalThresholdInfo; @@ -71,6 +70,7 @@ import com.android.internal.telephony.gsm.SuppServiceNotification; import com.android.internal.telephony.uicc.IccCardStatus; import com.android.internal.telephony.uicc.IccIoResult; import com.android.internal.telephony.uicc.IccSlotStatus; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.List; diff --git a/tests/telephonytests/src/com/android/internal/telephony/SimulatedGsmCallState.java b/tests/telephonytests/src/com/android/internal/telephony/SimulatedGsmCallState.java index 6d4f3857ee..53fd987eb3 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/SimulatedGsmCallState.java +++ b/tests/telephonytests/src/com/android/internal/telephony/SimulatedGsmCallState.java @@ -21,10 +21,10 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.telephony.PhoneNumberUtils; -import android.telephony.Rlog; import com.android.internal.telephony.ATParseEx; import com.android.internal.telephony.DriverCall; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.List; diff --git a/tests/telephonytests/src/com/android/internal/telephony/SmsMessageBodyTest.java b/tests/telephonytests/src/com/android/internal/telephony/SmsMessageBodyTest.java index 32dfef8edc..bd963efd7d 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/SmsMessageBodyTest.java +++ b/tests/telephonytests/src/com/android/internal/telephony/SmsMessageBodyTest.java @@ -16,18 +16,11 @@ package com.android.internal.telephony; -import android.telephony.SmsMessage; import android.telephony.TelephonyManager; -import android.telephony.Rlog; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.SmallTest; -import android.util.Log; -import com.android.internal.telephony.SmsConstants; - -import java.util.Random; +import com.android.telephony.Rlog; /** * Test cases to verify selection of the optimal 7 bit encoding tables diff --git a/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java b/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java index 3cbc501d95..3d707dacaf 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java +++ b/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java @@ -17,7 +17,6 @@ package com.android.internal.telephony.cdma; import android.hardware.radio.V1_0.CdmaSmsMessage; -import android.telephony.Rlog; import android.telephony.SmsCbCmasInfo; import android.telephony.SmsCbMessage; import android.telephony.cdma.CdmaSmsCbProgramData; @@ -32,6 +31,7 @@ import com.android.internal.telephony.cdma.sms.CdmaSmsAddress; import com.android.internal.telephony.cdma.sms.SmsEnvelope; import com.android.internal.telephony.cdma.sms.UserData; import com.android.internal.util.BitwiseOutputStream; +import com.android.telephony.Rlog; import org.junit.Ignore; import org.junit.Test; diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java index 820f4638f3..6ed0c8b08d 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java +++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java @@ -38,7 +38,6 @@ import android.os.AsyncResult; import android.os.Handler; import android.os.Looper; import android.telephony.AccessNetworkConstants; -import android.telephony.Rlog; import android.telephony.data.ApnSetting; import android.test.suitebuilder.annotation.SmallTest; import android.testing.AndroidTestingRunner; @@ -51,6 +50,7 @@ import com.android.internal.telephony.RadioConfig; import com.android.internal.telephony.TelephonyTest; import com.android.internal.telephony.dataconnection.TransportManager.HandoverParams; import com.android.internal.telephony.dataconnection.TransportManager.HandoverParams.HandoverCallback; +import com.android.telephony.Rlog; import org.junit.After; import org.junit.Before; @@ -61,7 +61,6 @@ import org.mockito.Mock; import java.lang.reflect.Field; import java.util.ArrayList; - @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper public class TelephonyNetworkFactoryTest extends TelephonyTest { diff --git a/tests/telephonytests/src/com/android/internal/telephony/gsm/GSMTestHandler.java.broken b/tests/telephonytests/src/com/android/internal/telephony/gsm/GSMTestHandler.java.broken index aa94e0e104..16861fac7f 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/gsm/GSMTestHandler.java.broken +++ b/tests/telephonytests/src/com/android/internal/telephony/gsm/GSMTestHandler.java.broken @@ -22,7 +22,7 @@ import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; import android.os.Message; -import android.telephony.Rlog; +import com.android.telephony.Rlog; import com.android.internal.telephony.gsm.GSMPhone; import com.android.internal.telephony.test.SimulatedCommands; diff --git a/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java.broken b/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java.broken index c599ad0b43..a9d869c4cb 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java.broken +++ b/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java.broken @@ -20,7 +20,7 @@ import android.content.Context; import android.os.AsyncResult; import android.os.Message; import android.os.SystemClock; -import android.telephony.Rlog; +import com.android.telephony.Rlog; import com.android.internal.telephony.BaseCommands; import com.android.internal.telephony.UUSInfo; diff --git a/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadTest.java.broken b/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadTest.java.broken index f32e4bd6a5..9fbb86c264 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadTest.java.broken +++ b/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadTest.java.broken @@ -18,7 +18,7 @@ package com.android.internal.telephony.gsm; import android.os.HandlerThread; import android.test.AndroidTestCase; -import android.telephony.Rlog; +import com.android.telephony.Rlog; import java.nio.charset.Charset; -- cgit v1.2.3