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

Commit 7ac5deaf authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Do not throw RuntimeException from stopScan()."

parents 27c64aaf 5e366e31

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
@@ -5222,7 +5222,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.