Remove usage of Telephonymanager getDefault() and from() hidden APIs

This CL replaces with getSystemService(TelephonyManager.class)

Bug: 140768340
Test: atest frameworks/base/tests/net
Change-Id: I0f14cc5440fa85c81ab90f3199e9e91c1b00f5e1
This commit is contained in:
Jayachandran C
2019-11-15 09:58:04 -08:00
parent 96639a6e4e
commit 2092850198
2 changed files with 4 additions and 3 deletions

View File

@@ -94,7 +94,8 @@ public class MultinetworkPolicyTracker {
} }
}; };
TelephonyManager.from(ctx).listen(new PhoneStateListener(handler.getLooper()) { ctx.getSystemService(TelephonyManager.class).listen(
new PhoneStateListener(handler.getLooper()) {
@Override @Override
public void onActiveDataSubscriptionIdChanged(int subId) { public void onActiveDataSubscriptionIdChanged(int subId) {
mActiveSubId = subId; mActiveSubId = subId;

View File

@@ -192,8 +192,8 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
mService = new NetworkStatsService( mService = new NetworkStatsService(
mServiceContext, mNetManager, mAlarmManager, wakeLock, mClock, mServiceContext, mNetManager, mAlarmManager, wakeLock, mClock,
TelephonyManager.getDefault(), mSettings, mStatsFactory, mServiceContext.getSystemService(TelephonyManager.class), mSettings,
new NetworkStatsObservers(), mStatsDir, getBaseDir(mStatsDir)); mStatsFactory, new NetworkStatsObservers(), mStatsDir, getBaseDir(mStatsDir));
mHandlerThread = new HandlerThread("HandlerThread"); mHandlerThread = new HandlerThread("HandlerThread");
mHandlerThread.start(); mHandlerThread.start();
Handler.Callback callback = new NetworkStatsService.HandlerCallback(mService); Handler.Callback callback = new NetworkStatsService.HandlerCallback(mService);