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

Commit 335b1507 authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge "[MS32.1] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" am: ac674f3b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1935965

Change-Id: I0cb29b5c09e194e7b7e63ff0d6d0e30c6e95e779
parents 08c51b04 ac674f3b

packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java

+14 −11
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import static android.net.NetworkStats.UID_ALL; 
import static android.net.NetworkStatsHistory.FIELD_ALL;

import static android.net.NetworkTemplate.buildTemplateMobileWildcard;

import static android.net.NetworkTemplate.buildTemplateWifiWildcard;

import static android.net.TetheringManager.ACTION_TETHER_STATE_CHANGED;

import static android.net.TrafficStats.KB_IN_BYTES;

import static android.net.TrafficStats.MB_IN_BYTES;

import static android.net.TrafficStats.UNSUPPORTED;
@@ -107,6 +106,7 @@ import android.net.NetworkStatsCollection; 
import android.net.NetworkStatsHistory;

import android.net.NetworkTemplate;

import android.net.TelephonyNetworkSpecifier;

import android.net.TetheringManager;

import android.net.TrafficStats;

import android.net.UnderlyingNetworkInfo;

import android.net.Uri;
@@ -531,8 +531,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
        }



        // watch for tethering changes

        final IntentFilter tetherFilter = new IntentFilter(ACTION_TETHER_STATE_CHANGED);

        mContext.registerReceiver(mTetherReceiver, tetherFilter, null, mHandler);

        final TetheringManager tetheringManager = mContext.getSystemService(TetheringManager.class);

        tetheringManager.registerTetheringEventCallback(

                new HandlerExecutor(mHandler), mTetherListener);



        // listen for periodic polling events

        final IntentFilter pollFilter = new IntentFilter(ACTION_NETWORK_STATS_POLL);
@@ -588,7 +589,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 


    @GuardedBy("mStatsLock")

    private void shutdownLocked() {

        mContext.unregisterReceiver(mTetherReceiver);

        final TetheringManager tetheringManager = mContext.getSystemService(TetheringManager.class);

        tetheringManager.unregisterTetheringEventCallback(mTetherListener);

        mContext.unregisterReceiver(mPollReceiver);

        mContext.unregisterReceiver(mRemovedReceiver);

        mContext.unregisterReceiver(mUserReceiver);
@@ -1152,11 +1154,12 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
    }



    /**

     * Receiver that watches for {@link Tethering} to claim interface pairs.

     * Listener that watches for {@link TetheringManager} to claim interface pairs.

     */

    private BroadcastReceiver mTetherReceiver = new BroadcastReceiver() {

    private final TetheringManager.TetheringEventCallback mTetherListener =

            new TetheringManager.TetheringEventCallback() {

                @Override

        public void onReceive(Context context, Intent intent) {

                public void onUpstreamChanged(@Nullable Network network) {

                    performPoll(FLAG_PERSIST_NETWORK);

                }

            };