Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 73e22ad21d
am: 01586c399e
Change-Id: I7613a654dd726bcf5428a5a07ad4369f616bbcfa
This commit is contained in:
committed by
android-build-merger
commit
0049091605
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user