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

am: 73e22ad21d

Change-Id: I555617ff893acf4c53e6a73d6591b6aaebf3ce50
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-17 22:30:01 -08:00
committed by android-build-merger
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
public void onActiveDataSubscriptionIdChanged(int subId) {
mActiveSubId = subId;

View File

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