Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix doc of NETWORK_TYPE_NR & add converter"

Browse Source 
am: 1abe6aa53f

Change-Id: I60d839b62e9b9365df48c72b040f1f5b2e7b011c
This commit is contained in:
Pengquan Meng
2019-01-23 20:37:47 -08:00
committed by android-build-merger
parent e055bfa0fa 1abe6aa53f
commit a4e9cec4b3
2 changed files with 48 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
telephony/java/android/telephony/ServiceState.java
View File

@@ -1410,47 +1410,49 @@ public class ServiceState implements Parcelable {
} }
/** @hide */ /** @hide */
public static int rilRadioTechnologyToNetworkType(@RilRadioTechnology int rt) { public static int rilRadioTechnologyToNetworkType(@RilRadioTechnology int rat) {
switch(rt) { switch(rat) {
case ServiceState.RIL_RADIO_TECHNOLOGY_GPRS: case ServiceState.RIL_RADIO_TECHNOLOGY_GPRS:
return TelephonyManager.NETWORK_TYPE_GPRS; return TelephonyManager.NETWORK_TYPE_GPRS;
case ServiceState.RIL_RADIO_TECHNOLOGY_EDGE: case ServiceState.RIL_RADIO_TECHNOLOGY_EDGE:
return TelephonyManager.NETWORK_TYPE_EDGE; return TelephonyManager.NETWORK_TYPE_EDGE;
case ServiceState.RIL_RADIO_TECHNOLOGY_UMTS: case ServiceState.RIL_RADIO_TECHNOLOGY_UMTS:
return TelephonyManager.NETWORK_TYPE_UMTS; return TelephonyManager.NETWORK_TYPE_UMTS;
case ServiceState.RIL_RADIO_TECHNOLOGY_HSDPA: case ServiceState.RIL_RADIO_TECHNOLOGY_HSDPA:
return TelephonyManager.NETWORK_TYPE_HSDPA; return TelephonyManager.NETWORK_TYPE_HSDPA;
case ServiceState.RIL_RADIO_TECHNOLOGY_HSUPA: case ServiceState.RIL_RADIO_TECHNOLOGY_HSUPA:
return TelephonyManager.NETWORK_TYPE_HSUPA; return TelephonyManager.NETWORK_TYPE_HSUPA;
case ServiceState.RIL_RADIO_TECHNOLOGY_HSPA: case ServiceState.RIL_RADIO_TECHNOLOGY_HSPA:
return TelephonyManager.NETWORK_TYPE_HSPA; return TelephonyManager.NETWORK_TYPE_HSPA;
case ServiceState.RIL_RADIO_TECHNOLOGY_IS95A: case ServiceState.RIL_RADIO_TECHNOLOGY_IS95A:
case ServiceState.RIL_RADIO_TECHNOLOGY_IS95B: case ServiceState.RIL_RADIO_TECHNOLOGY_IS95B:
return TelephonyManager.NETWORK_TYPE_CDMA; return TelephonyManager.NETWORK_TYPE_CDMA;
case ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT: case ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT:
return TelephonyManager.NETWORK_TYPE_1xRTT; return TelephonyManager.NETWORK_TYPE_1xRTT;
case ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0: case ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0:
return TelephonyManager.NETWORK_TYPE_EVDO_0; return TelephonyManager.NETWORK_TYPE_EVDO_0;
case ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A: case ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A:
return TelephonyManager.NETWORK_TYPE_EVDO_A; return TelephonyManager.NETWORK_TYPE_EVDO_A;
case ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_B: case ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_B:
return TelephonyManager.NETWORK_TYPE_EVDO_B; return TelephonyManager.NETWORK_TYPE_EVDO_B;
case ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD: case ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD:
return TelephonyManager.NETWORK_TYPE_EHRPD; return TelephonyManager.NETWORK_TYPE_EHRPD;
case ServiceState.RIL_RADIO_TECHNOLOGY_LTE: case ServiceState.RIL_RADIO_TECHNOLOGY_LTE:
return TelephonyManager.NETWORK_TYPE_LTE; return TelephonyManager.NETWORK_TYPE_LTE;
case ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP: case ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP:
return TelephonyManager.NETWORK_TYPE_HSPAP; return TelephonyManager.NETWORK_TYPE_HSPAP;
case ServiceState.RIL_RADIO_TECHNOLOGY_GSM: case ServiceState.RIL_RADIO_TECHNOLOGY_GSM:
return TelephonyManager.NETWORK_TYPE_GSM; return TelephonyManager.NETWORK_TYPE_GSM;
case ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA: case ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA:
return TelephonyManager.NETWORK_TYPE_TD_SCDMA; return TelephonyManager.NETWORK_TYPE_TD_SCDMA;
case ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN: case ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN:
return TelephonyManager.NETWORK_TYPE_IWLAN; return TelephonyManager.NETWORK_TYPE_IWLAN;
case ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA: case ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA:
return TelephonyManager.NETWORK_TYPE_LTE_CA; return TelephonyManager.NETWORK_TYPE_LTE_CA;
default: case ServiceState.RIL_RADIO_TECHNOLOGY_NR:
return TelephonyManager.NETWORK_TYPE_UNKNOWN; return TelephonyManager.NETWORK_TYPE_NR;
default:
return TelephonyManager.NETWORK_TYPE_UNKNOWN;
} }
} }

5
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -835,6 +835,7 @@ public class TelephonyManager {
* @see TelephonyManager#NETWORK_TYPE_LTE * @see TelephonyManager#NETWORK_TYPE_LTE
* @see TelephonyManager#NETWORK_TYPE_EHRPD * @see TelephonyManager#NETWORK_TYPE_EHRPD
* @see TelephonyManager#NETWORK_TYPE_HSPAP * @see TelephonyManager#NETWORK_TYPE_HSPAP
* @see TelephonyManager#NETWORK_TYPE_NR
* *
* <p class="note"> * <p class="note">
* Retrieve with * Retrieve with
@@ -2306,6 +2307,7 @@ public class TelephonyManager {
* @see #NETWORK_TYPE_LTE * @see #NETWORK_TYPE_LTE
* @see #NETWORK_TYPE_EHRPD * @see #NETWORK_TYPE_EHRPD
* @see #NETWORK_TYPE_HSPAP * @see #NETWORK_TYPE_HSPAP
* @see #NETWORK_TYPE_NR
* *
* @hide * @hide
*/ */
@@ -2357,6 +2359,7 @@ public class TelephonyManager {
* @see #NETWORK_TYPE_LTE * @see #NETWORK_TYPE_LTE
* @see #NETWORK_TYPE_EHRPD * @see #NETWORK_TYPE_EHRPD
* @see #NETWORK_TYPE_HSPAP * @see #NETWORK_TYPE_HSPAP
* @see #NETWORK_TYPE_NR
*/ */
@SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
@@ -2543,6 +2546,8 @@ public class TelephonyManager {
return "IWLAN"; return "IWLAN";
case NETWORK_TYPE_LTE_CA: case NETWORK_TYPE_LTE_CA:
return "LTE_CA"; return "LTE_CA";
case NETWORK_TYPE_NR:
return "NR";
default: default:
return "UNKNOWN"; return "UNKNOWN";
} }