Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 6d2b8e0d6a

Change-Id: Ief1f090f3664d583565f291c89357bfbac58fe17
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-18 01:09:40 -08:00
committed by android-build-merger
parent b61af00a0e 6d2b8e0d6a
commit a46de19da4
5 changed files with 13 additions and 6 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
public void onActiveDataSubscriptionIdChanged(int subId) {
mActiveSubId = subId;

4
services/core/java/com/android/server/connectivity/Tethering.java
View File

@@ -286,8 +286,8 @@ public class Tethering extends BaseNetworkObserver {
private void startStateMachineUpdaters(Handler handler) {
mCarrierConfigChange.startListening();
TelephonyManager.from(mContext).listen(mPhoneStateListener,
PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE);
mContext.getSystemService(TelephonyManager.class).listen(
mPhoneStateListener, PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE);
IntentFilter filter = new IntentFilter();
filter.addAction(UsbManager.ACTION_USB_STATE);

2
services/core/java/com/android/server/net/NetworkStatsService.java
View File

@@ -337,7 +337,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
NetworkStatsService service = new NetworkStatsService(context, networkManager, alarmManager,
wakeLock, getDefaultClock(), TelephonyManager.getDefault(),
wakeLock, getDefaultClock(), context.getSystemService(TelephonyManager.class),
new DefaultNetworkStatsSettings(context), new NetworkStatsFactory(),
new NetworkStatsObservers(), getDefaultSystemDir(), getDefaultBaseDir());
service.registerLocalService();

6
tests/net/java/com/android/server/connectivity/TetheringTest.java
View File

@@ -208,6 +208,12 @@ public class TetheringTest {
if (Context.TELEPHONY_SERVICE.equals(name)) return mTelephonyManager;
return super.getSystemService(name);
}
@Override
public String getSystemServiceName(Class<?> serviceClass) {
if (TelephonyManager.class.equals(serviceClass)) return Context.TELEPHONY_SERVICE;
return super.getSystemServiceName(serviceClass);
}
}
public class MockIpServerDependencies extends IpServer.Dependencies {

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