Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09800cea authored by Daniel Bright's avatar Daniel Bright
Browse files

Moved RilRadioTechnology annotation 

Moved annotation from Annotation to ServiceState

Bug: 146084549
Test: FrameworkTests, TeleServiceTests
Change-Id: I76b157ea67ca84678a0bea4643770f7f85dd9a11
Merged-In: I76b157ea67ca84678a0bea4643770f7f85dd9a11
parent 25839820

src/java/com/android/internal/telephony/Connection.java

+1 −1
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ import android.annotation.UnsupportedAppUsage; 
import android.net.Uri;

import android.os.Bundle;

import android.os.SystemClock;

import android.telephony.Annotation.RilRadioTechnology;

import android.telephony.DisconnectCause;

import android.telephony.Rlog;

import android.telephony.ServiceState;

import android.telephony.ServiceState.RilRadioTechnology;

import android.telephony.emergency.EmergencyNumber;

import android.util.Log;

src/java/com/android/internal/telephony/GsmCdmaCallTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ import android.os.Registrant; 
import android.os.RegistrantList;

import android.sysprop.TelephonyProperties;

import android.telecom.TelecomManager;

import android.telephony.Annotation.RilRadioTechnology;

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;

import android.telephony.gsm.GsmCellLocation;

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ import android.sysprop.TelephonyProperties; 
import android.telecom.TelecomManager;

import android.telecom.VideoProfile;

import android.telephony.AccessNetworkConstants;

import android.telephony.Annotation.RilRadioTechnology;

import android.telephony.CarrierConfigManager;

import android.telephony.CellLocation;

import android.telephony.DataFailCause;
@@ -69,6 +68,7 @@ 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;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

src/java/com/android/internal/telephony/ServiceStateTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import android.sysprop.TelephonyProperties; 
import android.telephony.AccessNetworkConstants;

import android.telephony.AccessNetworkConstants.AccessNetworkType;

import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.Annotation.RilRadioTechnology;

import android.telephony.CarrierConfigManager;

import android.telephony.CellIdentity;

import android.telephony.CellIdentityCdma;
@@ -74,6 +73,7 @@ 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;

import android.telephony.SignalThresholdInfo;

import android.telephony.SubscriptionInfo;

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ import android.telephony.AccessNetworkConstants; 
import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.Annotation.ApnType;

import android.telephony.Annotation.DataFailureCause;

import android.telephony.Annotation.RilRadioTechnology;

import android.telephony.CarrierConfigManager;

import android.telephony.CellLocation;

import android.telephony.DataFailCause;
@@ -76,6 +75,7 @@ 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;

import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;

import android.telephony.TelephonyManager;