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

SettingsProvider: use sysprop as API for telephony am: 6eac929099

Browse Source 
Change-Id: I33d84833d3fa49b51c2287e545fab39a8903ffa4
This commit is contained in:
Inseob Kim
2020-04-14 02:32:39 +00:00
committed by Automerger Merge Worker
parent e81da2d8c4 6eac929099
commit 107e3e125b
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
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,17 @@ 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; for (int phoneId = 0;
phoneId < getTelephonyManager().getPhoneCount(); phoneId++) { phoneId < TelephonyManager.getDefault().getPhoneCount(); phoneId++) {
mode = TelephonyManager.getTelephonyProperty(phoneId, int mode = defaultNetworks.size() <= phoneId
"ro.telephony.default_network", || defaultNetworks.get(phoneId) == null
Integer.toString(RILConstants.PREFERRED_NETWORK_MODE)); ? RILConstants.PREFERRED_NETWORK_MODE : defaultNetworks.get(phoneId);
if (phoneId == 0) { if (phoneId > 0) val.append(',');
val = mode; val.append(mode);
} else {
val = val + "," + 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