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

Merge changes from topic "DEFAULT_PREFERRED_NETWORK_MODE" am: f2da40ad07

Browse Source 
Change-Id: I039f6121ffcb8ff29055d1a2fee46006a8b7af36
This commit is contained in:
Calvin Pan
2020-04-14 02:32:49 +00:00
committed by Automerger Merge Worker
parent 719a0a2ba8 f2da40ad07
commit c40cb4c0d8
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -9201,7 +9201,6 @@ package android.telephony {
field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1 field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1
field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0 field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0
field public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; // 0xffffffff field public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; // 0xffffffff
field public static final int DEFAULT_PREFERRED_NETWORK_MODE = 0; // 0x0
field public static final String EXTRA_ANOMALY_DESCRIPTION = "android.telephony.extra.ANOMALY_DESCRIPTION"; field public static final String EXTRA_ANOMALY_DESCRIPTION = "android.telephony.extra.ANOMALY_DESCRIPTION";
field public static final String EXTRA_ANOMALY_ID = "android.telephony.extra.ANOMALY_ID"; field public static final String EXTRA_ANOMALY_ID = "android.telephony.extra.ANOMALY_ID";
field @Deprecated public static final String EXTRA_APN_PROTOCOL = "apnProto"; field @Deprecated public static final String EXTRA_APN_PROTOCOL = "apnProto";

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

@@ -7618,9 +7618,8 @@ public class TelephonyManager {
* *
* @hide * @hide
*/ */
@SystemApi
public static final int DEFAULT_PREFERRED_NETWORK_MODE = public static final int DEFAULT_PREFERRED_NETWORK_MODE =
RILConstants.DEFAULT_PREFERRED_NETWORK_MODE; RILConstants.PREFERRED_NETWORK_MODE;
/** /**
* Get the preferred network type. * Get the preferred network type.

5
telephony/java/com/android/internal/telephony/RILConstants.java
View File

@@ -233,14 +233,11 @@ public interface RILConstants {
/** NR 5G, LTE, TD-SCDMA, CDMA, EVDO, GSM and WCDMA */ /** NR 5G, LTE, TD-SCDMA, CDMA, EVDO, GSM and WCDMA */
int NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 33; int NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 33;
/** Default preferred network mode */
int DEFAULT_PREFERRED_NETWORK_MODE = NETWORK_MODE_WCDMA_PREF;
@UnsupportedAppUsage @UnsupportedAppUsage
int PREFERRED_NETWORK_MODE = Optional.of(TelephonyProperties.default_network()) int PREFERRED_NETWORK_MODE = Optional.of(TelephonyProperties.default_network())
.filter(list -> !list.isEmpty()) .filter(list -> !list.isEmpty())
.map(list -> list.get(0)) .map(list -> list.get(0))
.orElse(DEFAULT_PREFERRED_NETWORK_MODE); .orElse(NETWORK_MODE_WCDMA_PREF);
int BAND_MODE_UNSPECIFIED = 0; //"unspecified" (selected by baseband automatically) int BAND_MODE_UNSPECIFIED = 0; //"unspecified" (selected by baseband automatically)
int BAND_MODE_EURO = 1; //"EURO band" (GSM-900 / DCS-1800 / WCDMA-IMT-2000) int BAND_MODE_EURO = 1; //"EURO band" (GSM-900 / DCS-1800 / WCDMA-IMT-2000)