Snap for 13368745 from 2cc359b3e038ebae3100d836cbe0964736b2412c to 25Q3-release (4d7d9937) · Commits · e / os / android_frameworks_opt_telephony

flags/misc.aconfig

+0 −8

Original line number	Diff line number	Diff line
		@@ -35,14 +35,6 @@ flag {
		bug: "304272356"
		}

		# OWNER=grantmenke TARGET=24Q3
		flag {
		name: "ensure_access_to_call_settings_is_restricted"
		namespace: "telephony"
		description: "Check if access to mobile network configs restricted before displaying call options"
		bug: "309655251"
		}

		# OWNER=rambowang TARGET=24Q3
		flag {
		name: "reset_mobile_network_settings"

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -2886,7 +2886,11 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		if (mFeatureFlags.preventHangupDuringCallMerge()) {
		if (imsCall != null && imsCall.isCallSessionMergePending()) {
		if (DBG) log("hangup call failed during call merge");

		// Notify Telecom that the disconnect failed due to an ongoing call merge.
		if (conn != null && mTelecomFlags.revertDisconnectingDuringMerge()) {
		conn.onConnectionEvent(android.telecom.Connection.EVENT_DISCONNECT_FAILED,
		null);
		}
		throw new CallStateException("can not hangup during call merge");
		}
		}

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

+25 −0

Original line number	Diff line number	Diff line
		@@ -326,6 +326,7 @@ public class SatelliteController extends Handler {
		private static final int EVENT_GET_SATELLITE_ENABLED_FOR_CARRIER_DONE = 65;
		private static final int REQUEST_SATELLITE_ENABLED = 66;
		private static final int REQUEST_IS_SATELLITE_ENABLED = 67;
		private static final int REQUEST_IS_DEMO_MODE_ENABLED = 68;

		@NonNull private static SatelliteController sInstance;
		@NonNull private final Context mContext;
		@@ -2350,6 +2351,18 @@ public class SatelliteController extends Handler {
		break;
		}

		case REQUEST_IS_DEMO_MODE_ENABLED: {
		plogd("REQUEST_IS_DEMO_MODE_ENABLED");
		SomeArgs args = (SomeArgs) msg.obj;
		ResultReceiver result = (ResultReceiver) args.arg1;
		try {
		handleRequestIsDemoModeEnabled(result);
		} finally {
		args.recycle();
		}
		break;
		}

		default:
		Log.w(TAG, "SatelliteControllerHandler: unexpected message code: " +
		msg.what);
		@@ -2826,6 +2839,18 @@ public class SatelliteController extends Handler {
		* if the request is successful or an error code if the request failed.
		*/
		public void requestIsDemoModeEnabled(@NonNull ResultReceiver result) {
		if (mFeatureFlags.satelliteImproveMultiThreadDesign()) {
		SomeArgs args = SomeArgs.obtain();
		args.arg1 = result;
		sendMessage(obtainMessage(REQUEST_IS_DEMO_MODE_ENABLED, args));
		return;
		}

		handleRequestIsDemoModeEnabled(result);
		}

		private void handleRequestIsDemoModeEnabled(@NonNull ResultReceiver result) {
		plogd("handleRequestIsDemoModeEnabled");
		int error = evaluateOemSatelliteRequestAllowed(true);
		if (error != SATELLITE_RESULT_SUCCESS) {
		result.send(error, null);

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -36,11 +36,10 @@ import android.util.Log;
		import com.android.internal.telephony.PackageChangeReceiver;

		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Map;
		import java.util.Set;
		import java.util.concurrent.ConcurrentHashMap;

		/**
		* SatelliteOptimizedApplicationsTracker will track the packages if they are Satellite optimized or
		@@ -48,7 +47,8 @@ import java.util.Set;
		*/
		public class SatelliteOptimizedApplicationsTracker {

		@NonNull private final Map<Integer, Set<String>> mSatelliteApplications = new HashMap<>();
		@NonNull private final ConcurrentHashMap<Integer, Set<String>> mSatelliteApplications =
		new ConcurrentHashMap<>();

		/** Action used to initialize the state of the Tracker. */
		private static final int ACTION_INITIALIZE_TRACKER = 0;

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -1597,6 +1597,7 @@ public class SatelliteControllerTest extends TelephonyTest {
		mIsDemoModeEnabledSemaphore.drainPermits();
		resetSatelliteControllerUT();
		mSatelliteControllerUT.requestIsDemoModeEnabled(mIsDemoModeEnabledReceiver);
		processAllMessages();
		assertTrue(waitForRequestIsDemoModeEnabledResult(1));
		assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE, mQueriedIsDemoModeEnabledResultCode);
		assertFalse(mQueriedIsDemoModeEnabled);
		@@ -1605,6 +1606,7 @@ public class SatelliteControllerTest extends TelephonyTest {
		setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
		verifySatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
		mSatelliteControllerUT.requestIsDemoModeEnabled(mIsDemoModeEnabledReceiver);
		processAllMessages();
		assertTrue(waitForRequestIsDemoModeEnabledResult(1));
		assertEquals(SATELLITE_RESULT_NOT_SUPPORTED, mQueriedIsDemoModeEnabledResultCode);
		assertFalse(mQueriedIsDemoModeEnabled);
		@@ -1613,6 +1615,7 @@ public class SatelliteControllerTest extends TelephonyTest {
		setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
		verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
		mSatelliteControllerUT.requestIsDemoModeEnabled(mIsDemoModeEnabledReceiver);
		processAllMessages();
		assertTrue(waitForRequestIsDemoModeEnabledResult(1));
		assertEquals(SATELLITE_RESULT_SERVICE_NOT_PROVISIONED, mQueriedIsDemoModeEnabledResultCode);
		assertFalse(mQueriedIsDemoModeEnabled);
		@@ -1623,6 +1626,7 @@ public class SatelliteControllerTest extends TelephonyTest {
		verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
		verifySatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
		mSatelliteControllerUT.requestIsDemoModeEnabled(mIsDemoModeEnabledReceiver);
		processAllMessages();
		assertTrue(waitForRequestIsDemoModeEnabledResult(1));
		assertEquals(SATELLITE_RESULT_SERVICE_NOT_PROVISIONED, mQueriedIsDemoModeEnabledResultCode);
		assertFalse(mQueriedIsDemoModeEnabled);
		@@ -1631,6 +1635,7 @@ public class SatelliteControllerTest extends TelephonyTest {
		boolean isDemoModeEnabled = mSatelliteControllerUT.isDemoModeEnabled();
		provisionSatelliteService();
		mSatelliteControllerUT.requestIsDemoModeEnabled(mIsDemoModeEnabledReceiver);
		processAllMessages();
		assertTrue(waitForRequestIsDemoModeEnabledResult(1));
		assertEquals(SATELLITE_RESULT_SUCCESS, mQueriedIsDemoModeEnabledResultCode);
		assertEquals(isDemoModeEnabled, mQueriedIsDemoModeEnabled);