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

Commit 00de9ad4 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Fix race condition in CarrierTextController"

parents 677044a8 d4c84aff
Loading
Loading
Loading
Loading
+4 −2
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.text.TextUtils;
import android.util.Log;
import android.util.Log;


import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;


import com.android.internal.telephony.IccCardConstants;
import com.android.internal.telephony.IccCardConstants;
@@ -66,6 +67,7 @@ public class CarrierTextController {
    private WifiManager mWifiManager;
    private WifiManager mWifiManager;
    private boolean[] mSimErrorState;
    private boolean[] mSimErrorState;
    private final int mSimSlotsNumber;
    private final int mSimSlotsNumber;
    @Nullable // Check for nullability before dispatching
    private CarrierTextCallback mCarrierTextCallback;
    private CarrierTextCallback mCarrierTextCallback;
    private Context mContext;
    private Context mContext;
    private CharSequence mSeparator;
    private CharSequence mSeparator;
@@ -74,12 +76,12 @@ public class CarrierTextController {
            new WakefulnessLifecycle.Observer() {
            new WakefulnessLifecycle.Observer() {
                @Override
                @Override
                public void onFinishedWakingUp() {
                public void onFinishedWakingUp() {
                    mCarrierTextCallback.finishedWakingUp();
                    if (mCarrierTextCallback != null) mCarrierTextCallback.finishedWakingUp();
                }
                }


                @Override
                @Override
                public void onStartedGoingToSleep() {
                public void onStartedGoingToSleep() {
                    mCarrierTextCallback.startedGoingToSleep();
                    if (mCarrierTextCallback != null) mCarrierTextCallback.startedGoingToSleep();
                }
                }
            };
            };