diff options
author | Hakjun Choi <hakjunc@google.com> | 2023-10-30 08:32:35 +0000 |
---|---|---|
committer | Hakjun Choi <hakjunc@google.com> | 2023-12-08 07:02:19 +0000 |
commit | 08c263538e10fa424621774a623530d41c6fa1de (patch) | |
tree | 1e1e7e07c32e5ea430ad92716d7e900684b3faa3 | |
parent | 042b87cb203ed9f7d490371b301fe709204cd57f (diff) | |
download | gsma_services-08c263538e10fa424621774a623530d41c6fa1de.tar.gz |
Modify wrapper to handle thrown exception while invoking registerForNtnSignalStrengthChanged API
return type become void from int, throws exception
Bug: 306111250
Test: atest SatelliteControllerTest, SatelliteManagerTest, SatelliteManagerTestOnMockService
Change-Id: I46b49703b1eda6ae86528ac144ec7cc4b79bee78
-rw-r--r-- | satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java index 2bacdba..ff36bf5 100644 --- a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java +++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java @@ -797,9 +797,9 @@ public class SatelliteManagerWrapper { /** Registers for NTN signal strength changed from satellite modem. */ @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) - @SatelliteResult public int registerForNtnSignalStrengthChanged( + public void registerForNtnSignalStrengthChanged( @NonNull @CallbackExecutor Executor executor, - @NonNull NtnSignalStrengthCallbackWrapper callback) { + @NonNull NtnSignalStrengthCallbackWrapper callback) throws SatelliteException { NtnSignalStrengthCallback internalCallback = new NtnSignalStrengthCallback() { @Override @@ -809,7 +809,11 @@ public class SatelliteManagerWrapper { } }; sNtnSignalStrengthCallbackWrapperMap.put(callback, internalCallback); - return mSatelliteManager.registerForNtnSignalStrengthChanged(executor, internalCallback); + try { + mSatelliteManager.registerForNtnSignalStrengthChanged(executor, internalCallback); + } catch (SatelliteException ex) { + throw ex; + } } /** @@ -821,7 +825,11 @@ public class SatelliteManagerWrapper { @NonNull NtnSignalStrengthCallbackWrapper callback) { NtnSignalStrengthCallback internalCallback = sNtnSignalStrengthCallbackWrapperMap.get(callback); if (internalCallback != null) { - mSatelliteManager.unregisterForNtnSignalStrengthChanged(internalCallback); + try { + mSatelliteManager.unregisterForNtnSignalStrengthChanged(internalCallback); + } catch (Exception ex) { + throw ex; + } } } |