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

Commit 5be6d729 authored by youngtaecha's avatar youngtaecha
Browse files

Chage featureFlag to carrierRoamingNbIotNtn 

Bug: 376281558
Flag: com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn
Test: atest SatelliteControllerTest#testLoggingCodeForResultReceiverCount
Test: Manually verified if the bugreport UX is shwoing to user when the condition is met.
Change-Id: Id2ef4a4fb07ddd531ccdb79e6eb96b14048d9fe4
parent 394ffd62

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

+6 −5
Original line number Diff line number Diff line
@@ -726,12 +726,13 @@ public class SatelliteController extends Handler { 
     *               (e.g., class name and method name)

     */

    public void incrementResultReceiverCount(String caller) {

        if (mFeatureFlags.geofenceEnhancementForBetterUx()) {

        if (mFeatureFlags.carrierRoamingNbIotNtn()) {

            synchronized (mResultReceiverTotalCountLock) {

                mResultReceiverTotalCount++;

                logd("[incrementResultReceiverCount] : " + caller

                        + " | ResultReceiver total count= " + mResultReceiverTotalCount);

                mResultReceiverCountPerMethodMap.compute(caller, (k, v) -> v == null ? 1 : v + 1);

                mResultReceiverCountPerMethodMap.compute(caller,

                        (k, v) -> v == null ? 1 : v + 1);



                if (mResultReceiverTotalCount > RESULT_RECEIVER_COUNT_ANOMALY_THRESHOLD) {

                    loge("[mResultReceiverTotalCount] is exceeds limits : "
@@ -745,7 +746,7 @@ public class SatelliteController extends Handler { 
                }

            }

        } else {

            logd("[incrementResultReceiverCount]: geofenceEnhancementForBetterUx is not enabled");

            logd("[incrementResultReceiverCount]: carrierRoamingNbIotNtn is not enabled");

        }

    }
@@ -757,7 +758,7 @@ public class SatelliteController extends Handler { 
     *               (e.g., class name and method name)

     */

    public void decrementResultReceiverCount(String caller) {

        if (mFeatureFlags.geofenceEnhancementForBetterUx()) {

        if (mFeatureFlags.carrierRoamingNbIotNtn()) {

            synchronized (mResultReceiverTotalCountLock) {

                if (mResultReceiverTotalCount > 0) {

                    mResultReceiverTotalCount--;
@@ -768,7 +769,7 @@ public class SatelliteController extends Handler { 
                        (k, v) -> v > 0 ? v - 1 : v);

            }

        } else {

            logd("[decrementResultReceiverCount]: geofenceEnhancementForBetterUx is not enabled");

            logd("[decrementResultReceiverCount]: carrierRoamingNbIotNtn is not enabled");

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -6270,14 +6270,14 @@ public class SatelliteControllerTest extends TelephonyTest { 
        final String callerSC =  "SC:ResultReceiver";

        final String callerSAC =  "SAC:ResultReceiver";



        doReturn(false).when(mFeatureFlags).geofenceEnhancementForBetterUx();

        doReturn(false).when(mFeatureFlags).carrierRoamingNbIotNtn();



        mSatelliteControllerUT.incrementResultReceiverCount(callerSC);

        assertEquals(0, mSatelliteControllerUT.getResultReceiverTotalCount());

        mSatelliteControllerUT.decrementResultReceiverCount(callerSC);

        assertEquals(0, mSatelliteControllerUT.getResultReceiverTotalCount());



        doReturn(true).when(mFeatureFlags).geofenceEnhancementForBetterUx();

        doReturn(true).when(mFeatureFlags).carrierRoamingNbIotNtn();



        mSatelliteControllerUT.incrementResultReceiverCount(callerSC);

        assertEquals(1, mSatelliteControllerUT.getResultReceiverTotalCount());