LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 73e22ad21d

Browse Source 
am: 01586c399e

Change-Id: I7613a654dd726bcf5428a5a07ad4369f616bbcfa
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-18 01:05:02 -08:00
committed by android-build-merger
parent e74f099313 01586c399e
commit 0049091605
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/util/MultinetworkPolicyTracker.java
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;

4
tests/net/java/com/android/server/net/NetworkStatsServiceTest.java
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);