Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2050c6ae authored by yinxu's avatar yinxu Committed by android-build-merger
Browse files

Merge "Do not throw RuntimeException from stopScan()." am: 7ac5deaf am: 9846b539 

am: 9921cf9f

Change-Id: Iaae3953ac28b3a90ad920b92a8db33a6ddb66b3d
parents 331b5ee4 9921cf9f

telephony/java/android/telephony/NetworkScan.java

+0 −2
Original line number Diff line number Diff line
@@ -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();

        }

    }

telephony/java/android/telephony/TelephonyManager.java

+2 −1
Original line number Diff line number Diff line
@@ -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.