PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Core refactor" into rvc-dev am: 1e5cf6525a am: 14e8c6dba1 am: 5092e504fa

Browse Source 
Change-Id: I0a86c0520f40cbb455fec84473b3a443673a24d5
This commit is contained in:
Bonian Chen
2020-04-07 06:30:48 +00:00
committed by Automerger Merge Worker
parent 3ec17d0cbb 5092e504fa
commit 629be6a8a8
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/network/telephony/TelephonyConstants.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.network.telephony; package com.android.settings.network.telephony;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
/** /**
@@ -210,6 +209,12 @@ public class TelephonyConstants {
* Copied from {@link android.telephony.RadioAccessFamily} * Copied from {@link android.telephony.RadioAccessFamily}
*/ */
public static class RadioAccessFamily { public static class RadioAccessFamily {
/**
* TODO: get rid of RAF definition in RadioAccessFamily and
* use {@link TelephonyManager.NetworkTypeBitMask}
* TODO: public definition {@link TelephonyManager.NetworkTypeBitMask} is long.
* TODO: Convert from int * to long everywhere including HAL definitions.
*/
// 2G // 2G
public static final int RAF_UNKNOWN = (int) TelephonyManager.NETWORK_TYPE_BITMASK_UNKNOWN; public static final int RAF_UNKNOWN = (int) TelephonyManager.NETWORK_TYPE_BITMASK_UNKNOWN;
public static final int RAF_GSM = (int) TelephonyManager.NETWORK_TYPE_BITMASK_GSM; public static final int RAF_GSM = (int) TelephonyManager.NETWORK_TYPE_BITMASK_GSM;
@@ -245,9 +250,7 @@ public class TelephonyConstants {
public static final int WCDMA = HS | RAF_UMTS; public static final int WCDMA = HS | RAF_UMTS;
// 4G // 4G
public static final int LTE = RAF_LTE | RAF_LTE_CA; public static final int LTE = RAF_LTE | RAF_LTE_CA;
// 5G // 5G
public static final int NR = RAF_NR; public static final int NR = RAF_NR;
} }
} }