Do not throw RuntimeException from stopScan().

This is a clean cherry-pick from
https://android-review.googlesource.com/#/c/platform/frameworks/base/+/635589/

Bug:73750871
Test: Unit Test
Change-Id: I640093627c103fe1d2fe5707e6854ba748789919
Merged-in: I640093627c103fe1d2fe5707e6854ba748789919
(cherry picked from commit 5e366e31aecbecafd3dfb4bfc8f69ada34b1f550)

diff --git a/telephony/java/android/telephony/NetworkScan.java b/telephony/java/android/telephony/NetworkScan.java
index 71a177a..7f43ee5 100644 (file)
--- a/telephony/java/android/telephony/NetworkScan.java
+++ b/telephony/java/android/telephony/NetworkScan.java
@@ -110,13 +110,11 @@ public class NetworkScan {
         ITelephony telephony = getITelephony();
         if (telephony == null) {
             Rlog.e(TAG, "Failed to get the ITelephony instance.");
-            throw new RuntimeException("Failed to get the ITelephony instance.");
         }
         try {
             telephony.stopNetworkScan(mSubId, mScanId);
         } catch (RemoteException ex) {
             Rlog.e(TAG, "stopNetworkScan  RemoteException", ex);
-            ex.rethrowAsRuntimeException();
         }
     }
 

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index b04ed0e..5329613 100644 (file)
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -5396,7 +5396,8 @@ public class TelephonyManager {
      * <p>
      * Requires Permission:
      *   {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
-     * Or the calling app has carrier privileges. @see #hasCarrierPrivileges()
+     * Or the calling app has carrier privileges.
+     * @see #hasCarrierPrivileges()
      *
      * @param request Contains all the RAT with bands/channels that need to be scanned.
      * @param executor The executor through which the callback should be invoked.