Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 306f8cec authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by android-build-merger
Browse files

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

am: 73e22ad2

Change-Id: I555617ff893acf4c53e6a73d6591b6aaebf3ce50
parents f6231d08 73e22ad2

core/java/android/net/util/MultinetworkPolicyTracker.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

services/core/java/com/android/server/connectivity/Tethering.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

services/core/java/com/android/server/net/NetworkStatsService.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

tests/net/java/com/android/server/connectivity/TetheringTest.java

+6 −0
Original line number Diff line number Diff line
@@ -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 {

tests/net/java/com/android/server/net/NetworkStatsServiceTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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);