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

Merge "Removed LTE_CA from Annotations" am: 8ab4812386 am: 8288b90353

Browse Source 
Change-Id: I25f4bb36d55d20f8b4d99fecfa238bdd60bc0d44
This commit is contained in:
Automerger Merge Worker
2020-01-03 19:11:22 +00:00
parent 1e9752f9e7 8288b90353
commit 55df86c362
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/Annotation.java
View File

@@ -98,7 +98,13 @@ public class Annotation {
TelephonyManager.NETWORK_TYPE_GSM,
TelephonyManager.NETWORK_TYPE_TD_SCDMA,
TelephonyManager.NETWORK_TYPE_IWLAN,
TelephonyManager.NETWORK_TYPE_LTE_CA,
//TODO: In order for @SystemApi methods to use this class, there cannot be any
// public hidden members. This network type is marked as hidden because it is not a
// true network type and we are looking to remove it completely from the available list
// of network types.
//TelephonyManager.NETWORK_TYPE_LTE_CA,
TelephonyManager.NETWORK_TYPE_NR,
})
@Retention(RetentionPolicy.SOURCE)