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

Commit 18841a20 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Gerrit Code Review
Browse files

Merge "Replace PhoneStateListener @hide constructors with public ones."

parents d4c7a040 83753659

src/java/com/android/internal/telephony/PhoneSwitcher.java

+2 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import com.android.internal.telephony.metrics.TelephonyMetrics; 
import com.android.internal.telephony.nano.TelephonyProto.TelephonyEvent;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyEvent.DataSwitch;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyEvent.OnDemandDataSwitch;

import com.android.internal.telephony.util.HandlerExecutor;

import com.android.internal.util.IndentingPrintWriter;

import com.android.telephony.Rlog;
@@ -337,7 +338,7 @@ public class PhoneSwitcher extends Handler { 
        mSubscriptionController = SubscriptionController.getInstance();

        mRadioConfig = RadioConfig.getInstance(mContext);



        mPhoneStateListener = new PhoneStateListener(looper) {

        mPhoneStateListener = new PhoneStateListener(new HandlerExecutor(this)) {

            @Override

            public void onPhoneCapabilityChanged(PhoneCapability capability) {

                onPhoneCapabilityChangedInternal(capability);

src/java/com/android/internal/telephony/dataconnection/DcController.java

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.telephony.data.DataCallResponse; 
import com.android.internal.telephony.DctConstants;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.dataconnection.DataConnection.UpdateLinkPropertyResult;

import com.android.internal.telephony.util.HandlerExecutor;

import com.android.internal.telephony.util.TelephonyUtils;

import com.android.internal.util.State;

import com.android.internal.util.StateMachine;
@@ -95,7 +96,7 @@ public class DcController extends StateMachine { 
        setInitialState(mDccDefaultState);

        log("X ctor");



        mPhoneStateListener = new PhoneStateListener(handler.getLooper()) {

        mPhoneStateListener = new PhoneStateListener(new HandlerExecutor(handler)) {

            @Override

            public void onCarrierNetworkChange(boolean active) {

                mExecutingCarrierChange = active;