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

Commit 44756c58 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[MS39.1] Remove the looper from NetworkStatsSubscriptionMonitor" am:... 

Merge "[MS39.1] Remove the looper from NetworkStatsSubscriptionMonitor" am: a8dd1f55 am: f9d029be am: 8c60b78c am: 3168535d

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

Change-Id: I92cc7a0199c1d86b02ac980314394e34899a15db
parents 55db6afd 3168535d

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

+3 −4
Original line number Original line Diff line number Diff line
@@ -448,7 +448,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
        handlerThread.start();

        handlerThread.start();

        mHandler = new NetworkStatsHandler(handlerThread.getLooper());

        mHandler = new NetworkStatsHandler(handlerThread.getLooper());

        mNetworkStatsSubscriptionsMonitor = deps.makeSubscriptionsMonitor(mContext,

        mNetworkStatsSubscriptionsMonitor = deps.makeSubscriptionsMonitor(mContext,

                mHandler.getLooper(), new HandlerExecutor(mHandler), this);

                new HandlerExecutor(mHandler), this);

        mContentResolver = mContext.getContentResolver();

        mContentResolver = mContext.getContentResolver();

        mContentObserver = mDeps.makeContentObserver(mHandler, mSettings,

        mContentObserver = mDeps.makeContentObserver(mHandler, mSettings,

                mNetworkStatsSubscriptionsMonitor);

                mNetworkStatsSubscriptionsMonitor);
@@ -474,11 +474,10 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
         */

         */

        @NonNull

        @NonNull

        public NetworkStatsSubscriptionsMonitor makeSubscriptionsMonitor(@NonNull Context context,

        public NetworkStatsSubscriptionsMonitor makeSubscriptionsMonitor(@NonNull Context context,

                @NonNull Looper looper, @NonNull Executor executor,

                @NonNull Executor executor, @NonNull NetworkStatsService service) {

                @NonNull NetworkStatsService service) {

            // TODO: Update RatType passively in NSS, instead of querying into the monitor

            // TODO: Update RatType passively in NSS, instead of querying into the monitor

            //  when notifyNetworkStatus.

            //  when notifyNetworkStatus.

            return new NetworkStatsSubscriptionsMonitor(context, looper, executor,

            return new NetworkStatsSubscriptionsMonitor(context, executor,

                    (subscriberId, type) -> service.handleOnCollapsedRatTypeChanged());

                    (subscriberId, type) -> service.handleOnCollapsedRatTypeChanged());

        }

        }

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.net.NetworkTemplate.getCollapsedRatType; 




import android.annotation.NonNull;

import android.annotation.NonNull;

import android.content.Context;

import android.content.Context;

import android.os.Looper;

import android.telephony.Annotation;

import android.telephony.Annotation;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.PhoneStateListener;

import android.telephony.PhoneStateListener;
@@ -79,9 +78,9 @@ public class NetworkStatsSubscriptionsMonitor extends 
    @NonNull

    @NonNull

    private final Executor mExecutor;

    private final Executor mExecutor;





    NetworkStatsSubscriptionsMonitor(@NonNull Context context, @NonNull Looper looper,

    NetworkStatsSubscriptionsMonitor(@NonNull Context context,

            @NonNull Executor executor, @NonNull Delegate delegate) {

            @NonNull Executor executor, @NonNull Delegate delegate) {

        super(looper);

        super();

        mSubscriptionManager = (SubscriptionManager) context.getSystemService(

        mSubscriptionManager = (SubscriptionManager) context.getSystemService(

                Context.TELEPHONY_SUBSCRIPTION_SERVICE);

                Context.TELEPHONY_SUBSCRIPTION_SERVICE);

        mTeleManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);

        mTeleManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);