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"

Browse Source 
* changes:
  Make DEFAULT_PREFERRED_NETWORK_MODE @hide for now
  Add new system API constant DEFAULT_PREFERRED_NETWORK_MODE
  Remove usage of Telephonymanager getDefault() hidden API
  SettingsProvider: use sysprop as API for telephony
This commit is contained in:
Calvin Pan
2020-04-14 02:13:14 +00:00
committed by Gerrit Code Review
parent ec6cf543f9 a6a4858079
commit f2da40ad07
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -41,6 +41,7 @@ import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.provider.Settings.Global; import android.provider.Settings.Global;
import android.provider.Settings.Secure; import android.provider.Settings.Secure;
import android.sysprop.TelephonyProperties;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@@ -2496,9 +2497,7 @@ class DatabaseHelper extends SQLiteOpenHelper {
// Data roaming default, based on build // Data roaming default, based on build
loadSetting(stmt, Settings.Global.DATA_ROAMING, loadSetting(stmt, Settings.Global.DATA_ROAMING,
"true".equalsIgnoreCase( TelephonyProperties.data_roaming().orElse(false) ? 1 : 0);
SystemProperties.get("ro.com.android.dataroaming",
"false")) ? 1 : 0);
loadBooleanSetting(stmt, Settings.Global.DEVICE_PROVISIONED, loadBooleanSetting(stmt, Settings.Global.DEVICE_PROVISIONED,
R.bool.def_device_provisioned); R.bool.def_device_provisioned);
@@ -2519,9 +2518,7 @@ class DatabaseHelper extends SQLiteOpenHelper {
// Mobile Data default, based on build // Mobile Data default, based on build
loadSetting(stmt, Settings.Global.MOBILE_DATA, loadSetting(stmt, Settings.Global.MOBILE_DATA,
"true".equalsIgnoreCase( TelephonyProperties.mobile_data().orElse(true) ? 1 : 0);
SystemProperties.get("ro.com.android.mobiledata",
"true")) ? 1 : 0);
loadBooleanSetting(stmt, Settings.Global.NETSTATS_ENABLED, loadBooleanSetting(stmt, Settings.Global.NETSTATS_ENABLED,
R.bool.def_netstats_enabled); R.bool.def_netstats_enabled);
@@ -2575,20 +2572,22 @@ class DatabaseHelper extends SQLiteOpenHelper {
// Set the preferred network mode to target desired value or Default // Set the preferred network mode to target desired value or Default
// value defined in system property // value defined in system property
String val = ""; StringBuilder val = new StringBuilder();
String mode; List<Integer> defaultNetworks = TelephonyProperties.default_network();
for (int phoneId = 0; int phoneCount = 1;
phoneId < getTelephonyManager().getPhoneCount(); phoneId++) { TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
mode = TelephonyManager.getTelephonyProperty(phoneId, if (telephonyManager != null) {
"ro.telephony.default_network", phoneCount = telephonyManager.getSupportedModemCount();
Integer.toString(RILConstants.PREFERRED_NETWORK_MODE));
if (phoneId == 0) {
val = mode;
} else {
val = val + "," + mode;
} }
for (int phoneId = 0; phoneId < phoneCount; phoneId++) {
int mode = defaultNetworks.size() <= phoneId
|| defaultNetworks.get(phoneId) == null
? TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE
: defaultNetworks.get(phoneId);
if (phoneId > 0) val.append(',');
val.append(mode);
} }
loadSetting(stmt, Settings.Global.PREFERRED_NETWORK_MODE, val); loadSetting(stmt, Settings.Global.PREFERRED_NETWORK_MODE, val.toString());
// Set the preferred cdma subscription source to target desired value or default // Set the preferred cdma subscription source to target desired value or default
// value defined in Phone // value defined in Phone

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

@@ -7610,6 +7610,17 @@ public class TelephonyManager {
public static final int NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = public static final int NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA =
RILConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA; RILConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
/**
* The default preferred network mode constant.
*
* <p> This constant is used in case of nothing is set in
* TelephonyProperties#default_network().
*
* @hide
*/
public static final int DEFAULT_PREFERRED_NETWORK_MODE =
RILConstants.PREFERRED_NETWORK_MODE;
/** /**
* Get the preferred network type. * Get the preferred network type.
* Used for device configuration by some CDMA operators. * Used for device configuration by some CDMA operators.