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

Commit a13b43e6 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati
Browse files

Remove mDeviceProvisionLock 

The following variables are changed to atomic variables:
- mIsDeviceProvisioned
- mOverriddenIsSatelliteViaOemProvisioned

Bug: 409608013
Test: atest
Flag: com.android.internal.telephony.flags.satellite_improve_multi_thread_design
Change-Id: I51071d0e22f2c53e78b4a19a715ee63fb6b62a6c
parent 29dfc0b5

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+75 −91
Original line number Diff line number Diff line
@@ -392,6 +392,9 @@ public class SatelliteController extends Handler { 
    protected AtomicBoolean mIsRadioOn = new AtomicBoolean(false);

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)

    protected AtomicBoolean mRadioOffRequested = new AtomicBoolean(false);

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)

    protected AtomicBoolean mIsDeviceProvisioned = null;

    private AtomicBoolean mOverriddenIsSatelliteViaOemProvisioned = null;

    private AtomicBoolean mIgnorePlmnListFromStorage = new AtomicBoolean(false);



    private final Object mSatelliteEnabledRequestLock = new Object();
@@ -485,13 +488,6 @@ public class SatelliteController extends Handler { 
    private final ConcurrentHashMap<IBinder, ISelectedNbIotSatelliteSubscriptionCallback>

            mSelectedNbIotSatelliteSubscriptionChangedListeners = new ConcurrentHashMap<>();



    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)

    protected final Object mDeviceProvisionLock = new Object();

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)

    @GuardedBy("mDeviceProvisionLock")

    protected Boolean mIsDeviceProvisioned = null;

    @GuardedBy("mDeviceProvisionLock")

    private Boolean mOverriddenIsSatelliteViaOemProvisioned = null;

    private final Object mSatelliteCapabilitiesLock = new Object();

    @GuardedBy("mSatelliteCapabilitiesLock")

    private SatelliteCapabilities mSatelliteCapabilities;
@@ -3405,11 +3401,8 @@ public class SatelliteController extends Handler { 
        } catch (RemoteException ex) {

            loge("registerForSatelliteProvisionStateChanged: " + ex);

        }

        synchronized (mDeviceProvisionLock) {

        plogd("registerForSatelliteProvisionStateChanged: report current provisioned "

                + "state, state=" + isProvisioned);

        }



        return SATELLITE_RESULT_SUCCESS;

    }
@@ -3451,15 +3444,13 @@ public class SatelliteController extends Handler { 
            return;

        }



        synchronized (mDeviceProvisionLock) {

        if (mIsDeviceProvisioned != null) {

            Bundle bundle = new Bundle();

            bundle.putBoolean(SatelliteManager.KEY_SATELLITE_PROVISIONED,

                        mIsDeviceProvisioned);

                    mIsDeviceProvisioned.get());

            result.send(SATELLITE_RESULT_SUCCESS, bundle);

            return;

        }

        }



        sendRequestAsync(CMD_IS_SATELLITE_PROVISIONED, result, null);

        incrementResultReceiverCount("SC:requestIsSatelliteProvisioned");
@@ -4275,12 +4266,10 @@ public class SatelliteController extends Handler { 
            ploge("setOemEnabledSatelliteProvisionStatus: mock modem not allowed");

            return false;

        }

        synchronized (mDeviceProvisionLock) {

        if (reset) {

            mOverriddenIsSatelliteViaOemProvisioned = null;

        } else {

                mOverriddenIsSatelliteViaOemProvisioned = isProvisioned;

            }

            mOverriddenIsSatelliteViaOemProvisioned = new AtomicBoolean(isProvisioned);

        }

        return true;

    }
@@ -5139,16 +5128,14 @@ public class SatelliteController extends Handler { 
    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    @Nullable

    protected Boolean isDeviceProvisioned() {

        synchronized (mDeviceProvisionLock) {

        if (mOverriddenIsSatelliteViaOemProvisioned != null) {

                return mOverriddenIsSatelliteViaOemProvisioned;

            return mOverriddenIsSatelliteViaOemProvisioned.get();

        }



        if (mIsDeviceProvisioned == null) {

                mIsDeviceProvisioned = getPersistedDeviceProvisionStatus();

            }

            return mIsDeviceProvisioned;

            mIsDeviceProvisioned = new AtomicBoolean(getPersistedDeviceProvisionStatus());

        }

        return mIsDeviceProvisioned.get();

    }



    private void handleSatelliteEnabled(SatelliteControllerHandlerRequest request) {
@@ -5457,11 +5444,12 @@ public class SatelliteController extends Handler { 
    private void updateCachedDeviceProvisionStatus() {

        boolean isProvisioned = getPersistedDeviceProvisionStatus();

        plogd("updateCachedDeviceProvisionStatus: isProvisioned=" + isProvisioned);

        synchronized (mDeviceProvisionLock) {

            if (mIsDeviceProvisioned == null || mIsDeviceProvisioned != isProvisioned) {

                mIsDeviceProvisioned = isProvisioned;

        if (mIsDeviceProvisioned == null) {

            mIsDeviceProvisioned = new AtomicBoolean(isProvisioned);

            notifyDeviceProvisionStateChanged(isProvisioned);

        } else if (mIsDeviceProvisioned.get() != isProvisioned) {

            mIsDeviceProvisioned.set(isProvisioned);

            notifyDeviceProvisionStateChanged(isProvisioned);

            }

        }

    }
@@ -7047,7 +7035,6 @@ public class SatelliteController extends Handler { 
    }



    private void persistOemEnabledSatelliteProvisionStatus(boolean isProvisioned) {

        synchronized (mDeviceProvisionLock) {

        plogd("persistOemEnabledSatelliteProvisionStatus: isProvisioned=" + isProvisioned);

        if (mFeatureFlags.carrierRoamingNbIotNtn()) {

            int subId = getNtnOnlySubscriptionId();
@@ -7074,12 +7061,10 @@ public class SatelliteController extends Handler { 
            }

        }

    }

    }



    @Nullable

    private boolean getPersistedDeviceProvisionStatus() {

        plogd("getPersistedDeviceProvisionStatus");

        synchronized (mDeviceProvisionLock) {

        if (mFeatureFlags.carrierRoamingNbIotNtn()) {

            int subId = getNtnOnlySubscriptionId();

            if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
@@ -7119,7 +7104,6 @@ public class SatelliteController extends Handler { 
            }

        }

    }

    }



    private boolean loadSatelliteSharedPreferences() {

        if (mSharedPreferences == null) {

tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java

+10 −2
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ import java.util.concurrent.CountDownLatch; 
import java.util.concurrent.Executor;

import java.util.concurrent.Semaphore;

import java.util.concurrent.TimeUnit;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.stream.Collectors;



@RunWith(AndroidTestingRunner.class)
@@ -6083,8 +6084,15 @@ public class SatelliteControllerTest extends TelephonyTest { 
        }



        void setSatelliteProvisioned(@Nullable Boolean isProvisioned) {

            synchronized (mDeviceProvisionLock) {

                mIsDeviceProvisioned = isProvisioned;

            if (isProvisioned == null) {

                mIsDeviceProvisioned = null;

                return;

            }



            if (mIsDeviceProvisioned == null) {

                mIsDeviceProvisioned = new AtomicBoolean(isProvisioned);

            } else {

                mIsDeviceProvisioned.set(isProvisioned);

            }

        }