Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35e4ad97 authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Android (Google) Code Review
Browse files

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

parents c80c3cac 917199a3
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -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);