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

Commit ce40801e authored by Nathan Harold's avatar Nathan Harold
Browse files

Catch IllegalArgumentException on NetworkScan.stopScan 

IllegalArgumentException is thrown when a terminated
scan calls stop. This change softens the exception and
error type that is logged and considers this normal.

Bug: 113823866
Test: compilation
Change-Id: I7ce60d6badfac52156cceca83b39c1afe21b4eda
parent e238a19a

telephony/java/android/telephony/NetworkScan.java

+3 −2
Original line number Diff line number Diff line
@@ -16,11 +16,10 @@ 


package android.telephony;



import android.annotation.IntDef;

import android.content.Context;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.annotation.IntDef;

import android.util.Log;



import com.android.internal.telephony.ITelephony;
@@ -113,6 +112,8 @@ public class NetworkScan { 
        }

        try {

            telephony.stopNetworkScan(mSubId, mScanId);

        } catch (IllegalArgumentException ex) {

            Rlog.d(TAG,  "stopNetworkScan - no active scan for ScanID=" + mScanId);

        } catch (RemoteException ex) {

            Rlog.e(TAG, "stopNetworkScan  RemoteException", ex);

        } catch (RuntimeException ex) {