From 80eadad5b1c361b9eea2983212d1302bddd9a19e Mon Sep 17 00:00:00 2001
From: Jayachandran C <jayachandranc@google.com>
Date: Fri, 15 Nov 2019 16:05:54 -0800
Subject: [PATCH] Remove usage of Telephonymanager from() hidden API

This CL changes to use getSystemService(TelephonyManager.class)

Bug: 140768340
Test: atest DataUsageControllerTest
Change-Id: I377973fac09c29e9085c280c89d748e1c79c13e2
---
 .../src/com/android/settingslib/net/DataUsageController.java   | 3 ++-
 .../com/android/settingslib/net/DataUsageControllerTest.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java b/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
index ea3c1d95925c6..092cbf3c7c126 100644
--- a/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
@@ -222,7 +222,8 @@ public class DataUsageController {
             }
         }
 
-        return TelephonyManager.from(mContext).createForSubscriptionId(subscriptionId);
+        return mContext.getSystemService(
+                TelephonyManager.class).createForSubscriptionId(subscriptionId);
     }
 
     public void setMobileDataEnabled(boolean enabled) {
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java
index 3da5e766c3896..f7bee30a087f1 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java
@@ -75,7 +75,7 @@ public class DataUsageControllerTest {
     public void setUp() throws RemoteException {
         MockitoAnnotations.initMocks(this);
         when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
         when(mContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE))
                 .thenReturn(mSubscriptionManager);
         when(mContext.getSystemService(NetworkStatsManager.class)).thenReturn(mNetworkStatsManager);