Merge "Use alternative PhoneStateListener formal API" am: 5d0529e6

import static android.telephony.AccessNetworkConstants.TRANSPORT_TYPE_WWAN;

import static android.telephony.NetworkRegistrationInfo.DOMAIN_PS;

import android.annotation.NonNull;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.os.Handler;

import android.os.Looper;

import android.os.RemoteException;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.PhoneStateListener;

import com.android.internal.app.IBatteryStats;

import com.android.server.am.BatteryStatsService;

import java.util.concurrent.Executor;

import java.util.concurrent.RejectedExecutionException;

public class DataConnectionStats extends BroadcastReceiver {

    private static final String TAG = "DataConnectionStats";

    private static final boolean DEBUG = false;

        mContext = context;

        mBatteryStats = BatteryStatsService.getService();

        mListenerHandler = listenerHandler;

        mPhoneStateListener = new PhoneStateListenerImpl(listenerHandler.getLooper());

        mPhoneStateListener =

                new PhoneStateListenerImpl(new PhoneStateListenerExecutor(listenerHandler));

    }

    public void startMonitoring() {

                && mServiceState.getState() != ServiceState.STATE_POWER_OFF;

    }

    private static class PhoneStateListenerExecutor implements Executor {

        @NonNull

        private final Handler mHandler;

        PhoneStateListenerExecutor(@NonNull Handler handler) {

            mHandler = handler;

        }

        @Override

        public void execute(Runnable command) {

            if (!mHandler.post(command)) {

                throw new RejectedExecutionException(mHandler + " is shutting down");

            }

        }

    }

    private class PhoneStateListenerImpl extends PhoneStateListener {

        PhoneStateListenerImpl(Looper looper) {

            super(looper);

        PhoneStateListenerImpl(Executor executor) {

            super(executor);

        }

        @Override