Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Catch IllegalArgumentException on NetworkScan.stopScan"

Browse Source 
am: 84c2b6a843

Change-Id: I6d6bdd04eaceeb3dcb1e19487a7c4c44d3b08ec4
This commit is contained in:
Nathan Harold
2018-09-27 17:13:12 -07:00
committed by android-build-merger
parent 9bb8d34a9e 84c2b6a843
commit b4b64bbbdd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/android/telephony/NetworkScan.java
View File

@@ -16,11 +16,10 @@
package android.telephony; package android.telephony;
import android.annotation.IntDef;
import android.content.Context; import android.content.Context;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.annotation.IntDef;
import android.util.Log;
import com.android.internal.telephony.ITelephony; import com.android.internal.telephony.ITelephony;
@@ -113,6 +112,8 @@ public class NetworkScan {
} }
try { try {
telephony.stopNetworkScan(mSubId, mScanId); telephony.stopNetworkScan(mSubId, mScanId);
} catch (IllegalArgumentException ex) {
Rlog.d(TAG, "stopNetworkScan - no active scan for ScanID=" + mScanId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
Rlog.e(TAG, "stopNetworkScan RemoteException", ex); Rlog.e(TAG, "stopNetworkScan RemoteException", ex);
} catch (RuntimeException ex) { } catch (RuntimeException ex) {