Merge "Chage featureFlag to carrierRoamingNbIotNtn" into main (1c3ad5bb) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -731,12 +731,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 : "
		@@ -750,7 +751,7 @@ public class SatelliteController extends Handler {
		}
		}
		} else {
		logd("[incrementResultReceiverCount]: geofenceEnhancementForBetterUx is not enabled");
		logd("[incrementResultReceiverCount]: carrierRoamingNbIotNtn is not enabled");
		}
		}

		@@ -762,7 +763,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--;
		@@ -773,7 +774,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());