Merge "Revert^2 "reflect the refactoring for satellite API"" into main
diff --git a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java
index 792c984..cbbd621 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java
@@ -23,7 +23,6 @@
import android.os.OutcomeReceiver;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
-import android.telephony.satellite.SatelliteManager;
import android.telephony.satellite.wrapper.NtnSignalStrengthCallbackWrapper;
import android.telephony.satellite.wrapper.NtnSignalStrengthWrapper;
import android.telephony.satellite.wrapper.SatelliteCapabilitiesCallbackWrapper;
@@ -41,7 +40,6 @@
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
-
/**
* Activity related to SatelliteControl APIs for satellite.
*/
@@ -148,7 +146,7 @@
try {
mSatelliteManagerWrapper.requestNtnSignalStrength(mExecutor, receiver);
- } catch (SecurityException | IllegalStateException ex) {
+ } catch (SecurityException ex) {
String errorMessage = "requestNtnSignalStrength: " + ex.getMessage();
Log.d(TAG, errorMessage);
addLogMessage(errorMessage);
@@ -167,18 +165,10 @@
mSatelliteManagerWrapper.registerForNtnSignalStrengthChanged(mExecutor,
mNtnSignalStrengthCallback);
} catch (Exception ex) {
- String errorMessage;
- if (ex instanceof SatelliteManager.SatelliteException) {
- errorMessage =
- "registerForNtnSignalStrengthChanged: " + translateResultCodeToString(
- ((SatelliteManager.SatelliteException) ex).getErrorCode());
- } else {
- errorMessage = "registerForNtnSignalStrengthChanged: " + ex.getMessage();
- }
+ String errorMessage = "registerForNtnSignalStrengthChanged: " + ex.getMessage();
Log.d(TAG, errorMessage);
addLogMessage(errorMessage);
mNtnSignalStrengthCallback = null;
-
}
}
@@ -317,6 +307,8 @@
return "SATELLITE_RESULT_REQUEST_IN_PROGRESS";
case SatelliteManagerWrapper.SATELLITE_RESULT_MODEM_BUSY:
return "SATELLITE_RESULT_MODEM_BUSY";
+ case SatelliteManagerWrapper.SATELLITE_RESULT_ILLEGAL_STATE:
+ return "SATELLITE_RESULT_ILLEGAL_STATE";
default:
return "INVALID CODE: " + result;
}