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

Merge "Remove usage of Telephonymanager getDefault() hidden API"

Browse Source
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-19 22:36:05 +00:00
committed by Android (Google) Code Review
parent c80c3cac7e 917199a316
commit 35e4ad971c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2563,8 +2563,12 @@ class DatabaseHelper extends SQLiteOpenHelper {
// value defined in system property
StringBuilder val = new StringBuilder();
List<Integer> defaultNetworks = TelephonyProperties.default_network();
for (int phoneId = 0;
phoneId < TelephonyManager.getDefault().getPhoneCount(); phoneId++) {
int phoneCount = 1;
TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
if (telephonyManager != null) {
phoneCount = telephonyManager.getSupportedModemCount();
}
for (int phoneId = 0; phoneId < phoneCount; phoneId++) {
int mode = defaultNetworks.size() <= phoneId
|| defaultNetworks.get(phoneId) == null
? RILConstants.PREFERRED_NETWORK_MODE : defaultNetworks.get(phoneId);