Merge "Revert "Remove ServiceException from registerForNtnSignalStreang..."" into main (2e843741) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1998,7 +1998,7 @@ public class SatelliteController extends Handler {
		if (error == SATELLITE_RESULT_SUCCESS) {
		mNtnSignalStrengthChangedListeners.put(callback.asBinder(), callback);
		} else {
		throw new RemoteException(new IllegalStateException("registration fails: " + error));
		throw new ServiceSpecificException(error);
		}
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -95,6 +95,7 @@ import android.os.Message;
		import android.os.PersistableBundle;
		import android.os.RemoteException;
		import android.os.ResultReceiver;
		import android.os.ServiceSpecificException;
		import android.telephony.CarrierConfigManager;
		import android.telephony.Rlog;
		import android.telephony.ServiceState;
		@@ -3189,11 +3190,10 @@ public class SatelliteControllerTest extends TelephonyTest {
		throw new AssertionError();
		}
		} else {
		RemoteException ex = assertThrows(RemoteException.class,
		ServiceSpecificException ex = assertThrows(ServiceSpecificException.class,
		() -> mSatelliteControllerUT.registerForNtnSignalStrengthChanged(subId,
		callback));
		assertTrue("The cause is not IllegalStateException",
		ex.getCause() instanceof IllegalStateException);
		assertEquals(expectedError, ex.errorCode);
		}
		}