diff options
| -rw-r--r-- | src/com/android/settings/network/telephony/NetworkScanHelper.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/com/android/settings/network/telephony/NetworkScanHelper.java b/src/com/android/settings/network/telephony/NetworkScanHelper.java index 081a4978ab..cd686db046 100644 --- a/src/com/android/settings/network/telephony/NetworkScanHelper.java +++ b/src/com/android/settings/network/telephony/NetworkScanHelper.java @@ -232,20 +232,20 @@ public class NetworkScanHelper { if (mNetworkScanRequester != null) { mNetworkScanRequester.stopScan(); mNetworkScanRequester = null; - } - - try { - int slotIndex = mTelephonyManager.getSlotIndex(); - if (slotIndex >= 0 && slotIndex < mTelephonyManager.getActiveModemCount()) { - TelephonyUtils.abortIncrementalScan(mContext, slotIndex); - } else { - Log.d(TAG, "slotIndex is invalid, skipping abort"); + } else { + try { + int slotIndex = mTelephonyManager.getSlotIndex(); + if (slotIndex >= 0 && slotIndex < mTelephonyManager.getActiveModemCount()) { + TelephonyUtils.abortIncrementalScan(mContext, slotIndex); + } else { + Log.d(TAG, "slotIndex is invalid, skipping abort"); + } + mContext.unregisterReceiver(mLegacyIncrScanReceiver); + } catch (NullPointerException ex) { + Log.e(TAG, "abortIncrementalScan Exception: ", ex); + } catch (IllegalArgumentException ex) { + Log.e(TAG, "IllegalArgumentException"); } - mContext.unregisterReceiver(mLegacyIncrScanReceiver); - } catch (NullPointerException ex) { - Log.e(TAG, "abortIncrementalScan Exception: ", ex); - } catch (IllegalArgumentException ex) { - Log.e(TAG, "IllegalArgumentException"); } } |