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

Commit 73e22ad2 authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Gerrit Code Review
Browse files

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

parents e905264d 43fa1be0

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

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

            @Override

            public void onActiveDataSubscriptionIdChanged(int subId) {

            public void onActiveDataSubscriptionIdChanged(int subId) {

                mActiveSubId = subId;

                mActiveSubId = subId;

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -286,8 +286,8 @@ public class Tethering extends BaseNetworkObserver { 




    private void startStateMachineUpdaters(Handler handler) {

    private void startStateMachineUpdaters(Handler handler) {

        mCarrierConfigChange.startListening();

        mCarrierConfigChange.startListening();

        TelephonyManager.from(mContext).listen(mPhoneStateListener,

        mContext.getSystemService(TelephonyManager.class).listen(

                PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE);

                mPhoneStateListener, PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE);





        IntentFilter filter = new IntentFilter();

        IntentFilter filter = new IntentFilter();

        filter.addAction(UsbManager.ACTION_USB_STATE);

        filter.addAction(UsbManager.ACTION_USB_STATE);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -337,7 +337,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
                powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);

                powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);





        NetworkStatsService service = new NetworkStatsService(context, networkManager, alarmManager,

        NetworkStatsService service = new NetworkStatsService(context, networkManager, alarmManager,

                wakeLock, getDefaultClock(), TelephonyManager.getDefault(),

                wakeLock, getDefaultClock(), context.getSystemService(TelephonyManager.class),

                new DefaultNetworkStatsSettings(context), new NetworkStatsFactory(),

                new DefaultNetworkStatsSettings(context), new NetworkStatsFactory(),

                new NetworkStatsObservers(), getDefaultSystemDir(), getDefaultBaseDir());

                new NetworkStatsObservers(), getDefaultSystemDir(), getDefaultBaseDir());

        service.registerLocalService();

        service.registerLocalService();

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -208,6 +208,12 @@ public class TetheringTest { 
            if (Context.TELEPHONY_SERVICE.equals(name)) return mTelephonyManager;

            if (Context.TELEPHONY_SERVICE.equals(name)) return mTelephonyManager;

            return super.getSystemService(name);

            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 {

    public class MockIpServerDependencies extends IpServer.Dependencies {

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

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