Skip to content

Commit 1434d7b

Browse files
author
Robert Greenwalt
committed
Seperate RIL constants from the framework.
We have two sets of constants for network type. One used by the RIL can't be changed without big pains with OEM/Radio vendors. The other has been published as part of the framework and can't be easily changed either. Separate the two so it's clear where one should be used versus the other. bug:5717664 Change-Id: Ibf21f9165662e75557c7254fc9ad9a4870ba4af9
1 parent dc210ad commit 1434d7b

File tree

11 files changed

+170
-133
lines changed

11 files changed

+170
-133
lines changed

‎telephony/java/android/telephony/ServiceState.java‎

Lines changed: 94 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -64,44 +64,47 @@ public class ServiceState implements Parcelable {
6464

6565
/**
6666
* Available radio technologies for GSM, UMTS and CDMA.
67+
* Duplicates the constants from hardware/radio/include/ril.h
68+
* This should only be used by agents working with the ril. Others
69+
* should use the equivalent TelephonyManager.NETWORK_TYPE_*
6770
*/
6871
/** @hide */
69-
public static final int RADIO_TECHNOLOGY_UNKNOWN = 0;
72+
public static final int RIL_RADIO_TECHNOLOGY_UNKNOWN = 0;
7073
/** @hide */
71-
public static final int RADIO_TECHNOLOGY_GPRS = 1;
74+
public static final int RIL_RADIO_TECHNOLOGY_GPRS = 1;
7275
/** @hide */
73-
public static final int RADIO_TECHNOLOGY_EDGE = 2;
76+
public static final int RIL_RADIO_TECHNOLOGY_EDGE = 2;
7477
/** @hide */
75-
public static final int RADIO_TECHNOLOGY_UMTS = 3;
78+
public static final int RIL_RADIO_TECHNOLOGY_UMTS = 3;
7679
/** @hide */
77-
public static final int RADIO_TECHNOLOGY_IS95A = 4;
80+
public static final int RIL_RADIO_TECHNOLOGY_IS95A = 4;
7881
/** @hide */
79-
public static final int RADIO_TECHNOLOGY_IS95B = 5;
82+
public static final int RIL_RADIO_TECHNOLOGY_IS95B = 5;
8083
/** @hide */
81-
public static final int RADIO_TECHNOLOGY_1xRTT = 6;
84+
public static final int RIL_RADIO_TECHNOLOGY_1xRTT = 6;
8285
/** @hide */
83-
public static final int RADIO_TECHNOLOGY_EVDO_0 = 7;
86+
public static final int RIL_RADIO_TECHNOLOGY_EVDO_0 = 7;
8487
/** @hide */
85-
public static final int RADIO_TECHNOLOGY_EVDO_A = 8;
88+
public static final int RIL_RADIO_TECHNOLOGY_EVDO_A = 8;
8689
/** @hide */
87-
public static final int RADIO_TECHNOLOGY_HSDPA = 9;
90+
public static final int RIL_RADIO_TECHNOLOGY_HSDPA = 9;
8891
/** @hide */
89-
public static final int RADIO_TECHNOLOGY_HSUPA = 10;
92+
public static final int RIL_RADIO_TECHNOLOGY_HSUPA = 10;
9093
/** @hide */
91-
public static final int RADIO_TECHNOLOGY_HSPA = 11;
94+
public static final int RIL_RADIO_TECHNOLOGY_HSPA = 11;
9295
/** @hide */
93-
public static final int RADIO_TECHNOLOGY_EVDO_B = 12;
96+
public static final int RIL_RADIO_TECHNOLOGY_EVDO_B = 12;
9497
/** @hide */
95-
public static final int RADIO_TECHNOLOGY_EHRPD = 13;
98+
public static final int RIL_RADIO_TECHNOLOGY_EHRPD = 13;
9699
/** @hide */
97-
public static final int RADIO_TECHNOLOGY_LTE = 14;
100+
public static final int RIL_RADIO_TECHNOLOGY_LTE = 14;
98101
/** @hide */
99-
public static final int RADIO_TECHNOLOGY_HSPAP = 15;
102+
public static final int RIL_RADIO_TECHNOLOGY_HSPAP = 15;
100103
/**
101104
* GSM radio technology only supports voice. It does not support data.
102105
* @hide
103106
*/
104-
public static final int RADIO_TECHNOLOGY_GSM = 16;
107+
public static final int RIL_RADIO_TECHNOLOGY_GSM = 16;
105108

106109
/**
107110
* Available registration states for GSM, UMTS and CDMA.
@@ -400,72 +403,72 @@ && equalsHandlesNulls(mCdmaDefaultRoamingIndicator,
400403
*
401404
* @hide
402405
*/
403-
public static String radioTechnologyToString(int rt) {
406+
public static String rilRadioTechnologyToString(int rt) {
404407
String rtString;
405408

406409
switch(rt) {
407-
case 0:
410+
case RIL_RADIO_TECHNOLOGY_UNKNOWN:
408411
rtString = "Unknown";
409412
break;
410-
case 1:
413+
case RIL_RADIO_TECHNOLOGY_GPRS:
411414
rtString = "GPRS";
412415
break;
413-
case 2:
416+
case RIL_RADIO_TECHNOLOGY_EDGE:
414417
rtString = "EDGE";
415418
break;
416-
case 3:
419+
case RIL_RADIO_TECHNOLOGY_UMTS:
417420
rtString = "UMTS";
418421
break;
419-
case 4:
422+
case RIL_RADIO_TECHNOLOGY_IS95A:
420423
rtString = "CDMA-IS95A";
421424
break;
422-
case 5:
425+
case RIL_RADIO_TECHNOLOGY_IS95B:
423426
rtString = "CDMA-IS95B";
424427
break;
425-
case 6:
428+
case RIL_RADIO_TECHNOLOGY_1xRTT:
426429
rtString = "1xRTT";
427430
break;
428-
case 7:
431+
case RIL_RADIO_TECHNOLOGY_EVDO_0:
429432
rtString = "EvDo-rev.0";
430433
break;
431-
case 8:
434+
case RIL_RADIO_TECHNOLOGY_EVDO_A:
432435
rtString = "EvDo-rev.A";
433436
break;
434-
case 9:
437+
case RIL_RADIO_TECHNOLOGY_HSDPA:
435438
rtString = "HSDPA";
436439
break;
437-
case 10:
440+
case RIL_RADIO_TECHNOLOGY_HSUPA:
438441
rtString = "HSUPA";
439442
break;
440-
case 11:
443+
case RIL_RADIO_TECHNOLOGY_HSPA:
441444
rtString = "HSPA";
442445
break;
443-
case 12:
446+
case RIL_RADIO_TECHNOLOGY_EVDO_B:
444447
rtString = "EvDo-rev.B";
445448
break;
446-
case 13:
449+
case RIL_RADIO_TECHNOLOGY_EHRPD:
447450
rtString = "eHRPD";
448451
break;
449-
case 14:
452+
case RIL_RADIO_TECHNOLOGY_LTE:
450453
rtString = "LTE";
451454
break;
452-
case 15:
455+
case RIL_RADIO_TECHNOLOGY_HSPAP:
453456
rtString = "HSPAP";
454457
break;
455-
case 16:
458+
case RIL_RADIO_TECHNOLOGY_GSM:
456459
rtString = "GSM";
457460
break;
458461
default:
459462
rtString = "Unexpected";
460463
Log.w(LOG_TAG, "Unexpected radioTechnology=" + rt);
461464
break;
462465
}
463-
return rtString + ":" + rt;
466+
return rtString;
464467
}
465468

466469
@Override
467470
public String toString() {
468-
String radioTechnology = radioTechnologyToString(mRadioTechnology);
471+
String radioTechnology = rilRadioTechnologyToString(mRadioTechnology);
469472

470473
return (mState + " " + (mRoaming ? "roaming" : "home")
471474
+ " " + mOperatorAlphaLong
@@ -644,10 +647,47 @@ public void setSystemAndNetworkId(int systemId, int networkId) {
644647
}
645648

646649
/** @hide */
647-
public int getRadioTechnology() {
650+
public int getRilRadioTechnology() {
648651
return this.mRadioTechnology;
649652
}
650653

654+
/** @hide */
655+
public int getNetworkType() {
656+
switch(mRadioTechnology) {
657+
case ServiceState.RIL_RADIO_TECHNOLOGY_GPRS:
658+
return TelephonyManager.NETWORK_TYPE_GPRS;
659+
case ServiceState.RIL_RADIO_TECHNOLOGY_EDGE:
660+
return TelephonyManager.NETWORK_TYPE_EDGE;
661+
case ServiceState.RIL_RADIO_TECHNOLOGY_UMTS:
662+
return TelephonyManager.NETWORK_TYPE_UMTS;
663+
case ServiceState.RIL_RADIO_TECHNOLOGY_HSDPA:
664+
return TelephonyManager.NETWORK_TYPE_HSDPA;
665+
case ServiceState.RIL_RADIO_TECHNOLOGY_HSUPA:
666+
return TelephonyManager.NETWORK_TYPE_HSUPA;
667+
case ServiceState.RIL_RADIO_TECHNOLOGY_HSPA:
668+
return TelephonyManager.NETWORK_TYPE_HSPA;
669+
case ServiceState.RIL_RADIO_TECHNOLOGY_IS95A:
670+
case ServiceState.RIL_RADIO_TECHNOLOGY_IS95B:
671+
return TelephonyManager.NETWORK_TYPE_CDMA;
672+
case ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT:
673+
return TelephonyManager.NETWORK_TYPE_1xRTT;
674+
case ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0:
675+
return TelephonyManager.NETWORK_TYPE_EVDO_0;
676+
case ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A:
677+
return TelephonyManager.NETWORK_TYPE_EVDO_A;
678+
case ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_B:
679+
return TelephonyManager.NETWORK_TYPE_EVDO_B;
680+
case ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD:
681+
return TelephonyManager.NETWORK_TYPE_EHRPD;
682+
case ServiceState.RIL_RADIO_TECHNOLOGY_LTE:
683+
return TelephonyManager.NETWORK_TYPE_LTE;
684+
case ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP:
685+
return TelephonyManager.NETWORK_TYPE_HSPAP;
686+
default:
687+
return TelephonyManager.NETWORK_TYPE_UNKNOWN;
688+
}
689+
}
690+
651691
/** @hide */
652692
public int getCssIndicator() {
653693
return this.mCssIndicator ? 1 : 0;
@@ -665,25 +705,25 @@ public int getSystemId() {
665705

666706
/** @hide */
667707
public static boolean isGsm(int radioTechnology) {
668-
return radioTechnology == RADIO_TECHNOLOGY_GPRS
669-
|| radioTechnology == RADIO_TECHNOLOGY_EDGE
670-
|| radioTechnology == RADIO_TECHNOLOGY_UMTS
671-
|| radioTechnology == RADIO_TECHNOLOGY_HSDPA
672-
|| radioTechnology == RADIO_TECHNOLOGY_HSUPA
673-
|| radioTechnology == RADIO_TECHNOLOGY_HSPA
674-
|| radioTechnology == RADIO_TECHNOLOGY_LTE
675-
|| radioTechnology == RADIO_TECHNOLOGY_HSPAP
676-
|| radioTechnology == RADIO_TECHNOLOGY_GSM;
708+
return radioTechnology == RIL_RADIO_TECHNOLOGY_GPRS
709+
|| radioTechnology == RIL_RADIO_TECHNOLOGY_EDGE
710+
|| radioTechnology == RIL_RADIO_TECHNOLOGY_UMTS
711+
|| radioTechnology == RIL_RADIO_TECHNOLOGY_HSDPA
712+
|| radioTechnology == RIL_RADIO_TECHNOLOGY_HSUPA
713+
|| radioTechnology == RIL_RADIO_TECHNOLOGY_HSPA
714+
|| radioTechnology == RIL_RADIO_TECHNOLOGY_LTE
715+
|| radioTechnology == RIL_RADIO_TECHNOLOGY_HSPAP
716+
|| radioTechnology == RIL_RADIO_TECHNOLOGY_GSM;
677717
}
678718

679719
/** @hide */
680720
public static boolean isCdma(int radioTechnology) {
681-
return radioTechnology == RADIO_TECHNOLOGY_IS95A
682-
|| radioTechnology == RADIO_TECHNOLOGY_IS95B
683-
|| radioTechnology == RADIO_TECHNOLOGY_1xRTT
684-
|| radioTechnology == RADIO_TECHNOLOGY_EVDO_0
685-
|| radioTechnology == RADIO_TECHNOLOGY_EVDO_A
686-
|| radioTechnology == RADIO_TECHNOLOGY_EVDO_B
687-
|| radioTechnology == RADIO_TECHNOLOGY_EHRPD;
721+
return radioTechnology == RIL_RADIO_TECHNOLOGY_IS95A
722+
|| radioTechnology == RIL_RADIO_TECHNOLOGY_IS95B
723+
|| radioTechnology == RIL_RADIO_TECHNOLOGY_1xRTT
724+
|| radioTechnology == RIL_RADIO_TECHNOLOGY_EVDO_0
725+
|| radioTechnology == RIL_RADIO_TECHNOLOGY_EVDO_A
726+
|| radioTechnology == RIL_RADIO_TECHNOLOGY_EVDO_B
727+
|| radioTechnology == RIL_RADIO_TECHNOLOGY_EHRPD;
688728
}
689729
}

‎telephony/java/com/android/internal/telephony/DataConnection.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -355,14 +355,14 @@ private void notifyDisconnectCompleted(DisconnectParams dp, boolean sendAll) {
355355
if (DBG) log("NotifyDisconnectCompleted DisconnectParams=" + dp);
356356
}
357357

358-
protected int getRadioTechnology(int defaultRadioTechnology) {
359-
int radioTechnology;
358+
protected int getRilRadioTechnology(int defaultRilRadioTechnology) {
359+
int rilRadioTechnology;
360360
if (mRilVersion < 6) {
361-
radioTechnology = defaultRadioTechnology;
361+
rilRadioTechnology = defaultRilRadioTechnology;
362362
} else {
363-
radioTechnology = phone.getServiceState().getRadioTechnology() + 2;
363+
rilRadioTechnology = phone.getServiceState().getRilRadioTechnology() + 2;
364364
}
365-
return radioTechnology;
365+
return rilRadioTechnology;
366366
}
367367

368368
/*

‎telephony/java/com/android/internal/telephony/DataConnectionTracker.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import android.provider.Settings;
4141
import android.provider.Settings.SettingNotFoundException;
4242
import android.telephony.ServiceState;
43+
import android.telephony.TelephonyManager;
4344
import android.text.TextUtils;
4445
import android.util.Log;
4546

@@ -1165,15 +1166,14 @@ protected void onSetPolicyDataEnabled(boolean enabled) {
11651166
}
11661167

11671168
protected String getReryConfig(boolean forDefault) {
1168-
int rt = mPhone.getServiceState().getRadioTechnology();
1169-
1170-
if ((rt == ServiceState.RADIO_TECHNOLOGY_IS95A) ||
1171-
(rt == ServiceState.RADIO_TECHNOLOGY_IS95B) ||
1172-
(rt == ServiceState.RADIO_TECHNOLOGY_1xRTT) ||
1173-
(rt == ServiceState.RADIO_TECHNOLOGY_EVDO_0) ||
1174-
(rt == ServiceState.RADIO_TECHNOLOGY_EVDO_A) ||
1175-
(rt == ServiceState.RADIO_TECHNOLOGY_EVDO_B) ||
1176-
(rt == ServiceState.RADIO_TECHNOLOGY_EHRPD)) {
1169+
int nt = mPhone.getServiceState().getNetworkType();
1170+
1171+
if ((nt == TelephonyManager.NETWORK_TYPE_CDMA) ||
1172+
(nt == TelephonyManager.NETWORK_TYPE_1xRTT) ||
1173+
(nt == TelephonyManager.NETWORK_TYPE_EVDO_0) ||
1174+
(nt == TelephonyManager.NETWORK_TYPE_EVDO_A) ||
1175+
(nt == TelephonyManager.NETWORK_TYPE_EVDO_B) ||
1176+
(nt == TelephonyManager.NETWORK_TYPE_EHRPD)) {
11771177
// CDMA variant
11781178
return SystemProperties.get("ro.cdma.data_retry_config");
11791179
} else {

‎telephony/java/com/android/internal/telephony/PhoneProxy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ private void updatePhoneObject(int newVoiceRadioTech) {
149149
logd("LTE ON CDMA property is set. Switch to CDMALTEPhone" +
150150
" newVoiceRadioTech = " + newVoiceRadioTech +
151151
" Active Phone = " + mActivePhone.getPhoneName());
152-
newVoiceRadioTech = ServiceState.RADIO_TECHNOLOGY_1xRTT;
152+
newVoiceRadioTech = ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT;
153153
}
154154
} else {
155155
if ((ServiceState.isCdma(newVoiceRadioTech) &&
@@ -165,7 +165,7 @@ private void updatePhoneObject(int newVoiceRadioTech) {
165165
}
166166
}
167167

168-
if (newVoiceRadioTech == ServiceState.RADIO_TECHNOLOGY_UNKNOWN) {
168+
if (newVoiceRadioTech == ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN) {
169169
// We need some voice phone object to be active always, so never
170170
// delete the phone without anything to replace it with!
171171
logd("Ignoring voice radio technology changed message. newVoiceRadioTech = Unknown."

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ public abstract class ServiceStateTracker extends Handler {
5454
protected boolean mDesiredPowerState;
5555

5656
/**
57-
* Values correspond to ServiceState.RADIO_TECHNOLOGY_ definitions.
57+
* Values correspond to ServiceState.RIL_RADIO_TECHNOLOGY_ definitions.
5858
*/
59-
protected int mRadioTechnology = 0;
60-
protected int mNewRadioTechnology = 0;
59+
protected int mRilRadioTechnology = 0;
60+
protected int mNewRilRadioTechnology = 0;
6161

6262
/**
6363
* By default, strength polling is enabled. However, if we're

‎telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ protected void onConnect(ConnectionParams cp) {
8686
Message msg = obtainMessage(EVENT_SETUP_DATA_CONNECTION_DONE, cp);
8787
msg.obj = cp;
8888
phone.mCM.setupDataCall(
89-
Integer.toString(getRadioTechnology(RILConstants.SETUP_DATA_TECH_CDMA)),
89+
Integer.toString(getRilRadioTechnology(RILConstants.SETUP_DATA_TECH_CDMA)),
9090
Integer.toString(dataProfile),
9191
null, null, null,
9292
Integer.toString(RILConstants.SETUP_DATA_AUTH_PAP_CHAP),

0 commit comments

Comments
 (0)