Merge "Unregister network scan before deleting" into udc-dev (5c7a358d) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/NetworkScanRequestTracker.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -474,21 +474,21 @@ public final class NetworkScanRequestTracker {
		notifyMessenger(nsri, notifyMsg,
		rilErrorToScanError(nsr.scanError), nsr.networkInfos);
		if (nsr.scanStatus == NetworkScanResult.SCAN_STATUS_COMPLETE) {
		deleteScanAndMayNotify(nsri, NetworkScan.SUCCESS, true);
		nsri.mPhone.mCi.unregisterForNetworkScanResult(mHandler);
		deleteScanAndMayNotify(nsri, NetworkScan.SUCCESS, true);
		}
		} else {
		if (nsr.networkInfos != null) {
		notifyMessenger(nsri, notifyMsg,
		rilErrorToScanError(nsr.scanError), nsr.networkInfos);
		}
		deleteScanAndMayNotify(nsri, rilErrorToScanError(nsr.scanError), true);
		nsri.mPhone.mCi.unregisterForNetworkScanResult(mHandler);
		deleteScanAndMayNotify(nsri, rilErrorToScanError(nsr.scanError), true);
		}
		} else {
		logEmptyResultOrException(ar);
		deleteScanAndMayNotify(nsri, NetworkScan.ERROR_RADIO_INTERFACE_ERROR, true);
		nsri.mPhone.mCi.unregisterForNetworkScanResult(mHandler);
		deleteScanAndMayNotify(nsri, NetworkScan.ERROR_RADIO_INTERFACE_ERROR, true);
		}
		}

		@@ -516,6 +516,7 @@ public final class NetworkScanRequestTracker {
		Log.e(TAG, "EVENT_STOP_NETWORK_SCAN_DONE: nsri is null");
		return;
		}
		nsri.mPhone.mCi.unregisterForNetworkScanResult(mHandler);
		if (ar.exception == null && ar.result != null) {
		deleteScanAndMayNotify(nsri, NetworkScan.SUCCESS, true);
		} else {
		@@ -528,7 +529,6 @@ public final class NetworkScanRequestTracker {
		Log.wtf(TAG, "EVENT_STOP_NETWORK_SCAN_DONE: ar.exception can not be null!");
		}
		}
		nsri.mPhone.mCi.unregisterForNetworkScanResult(mHandler);
		}

		// Interrupts the live scan is the scanId matches the mScanId of the mLiveRequestInfo.