commit 2ee8dbb9676f09c2f310546612d0d02833b342fb
author Asmita Poddar <asmitapoddar@google.com> Wed Jan 24 12:24:19 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 24 12:24:19 2024 +0000
tree 3f455ae99efc808b5dbc6a8732f764cc352f6613
parent 078e08826b7e7ff8a4d3c077c9db7c14ac6724fc
parent 60b3b4ab1935447e825747a34fdd7b04c954ce23

Merge "Revert "reflect the refactoring for satellite API"" into main

testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java

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 cbbd621..792c984 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java
@@ -23,6 +23,7 @@
 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;
@@ -40,6 +41,7 @@
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
+
 /**
  * Activity related to SatelliteControl APIs for satellite.
  */
@@ -146,7 +148,7 @@
 
         try {
             mSatelliteManagerWrapper.requestNtnSignalStrength(mExecutor, receiver);
-        } catch (SecurityException ex) {
+        } catch (SecurityException | IllegalStateException ex) {
             String errorMessage = "requestNtnSignalStrength: " + ex.getMessage();
             Log.d(TAG, errorMessage);
             addLogMessage(errorMessage);
@@ -165,10 +167,18 @@
             mSatelliteManagerWrapper.registerForNtnSignalStrengthChanged(mExecutor,
                     mNtnSignalStrengthCallback);
         } catch (Exception ex) {
-            String errorMessage = "registerForNtnSignalStrengthChanged: " + ex.getMessage();
+            String errorMessage;
+            if (ex instanceof SatelliteManager.SatelliteException) {
+                errorMessage =
+                        "registerForNtnSignalStrengthChanged: " + translateResultCodeToString(
+                                ((SatelliteManager.SatelliteException) ex).getErrorCode());
+            } else {
+                errorMessage = "registerForNtnSignalStrengthChanged: " + ex.getMessage();
+            }
             Log.d(TAG, errorMessage);
             addLogMessage(errorMessage);
             mNtnSignalStrengthCallback = null;
+
         }
     }
 
@@ -307,8 +317,6 @@
                 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;
         }