From 917199a316a45e784fdc096f91705bf7fd37876a Mon Sep 17 00:00:00 2001
From: Jayachandran C <jayachandranc@google.com>
Date: Fri, 15 Nov 2019 16:33:32 -0800
Subject: [PATCH] Remove usage of Telephonymanager getDefault() hidden API

This CL replaces with getSystemService(TelephonyManager.class)

Bug: 140768340
Test: Build
Change-Id: Ifb7b53af787b86b1d6c2f91a96a330bde57271d7
---
 .../com/android/providers/settings/DatabaseHelper.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 386626d95eead..0c4db49740242 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -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);