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

Commit 60bdf063 authored by Sneh Bansal's avatar Sneh Bansal
Browse files

Abort the scan when modem becomes unavailable 

The modem may temporarily become unavailable if the radio proxy dies
while a scan is in progress. When this happens, further indications
related to the network scan are not received at the telephony layer,
and subsequently not passed on to Settings. This leads to the scan
being shown as going on indefinitely on the UI.

Fix this by detecting when the modem becomes unavailable and cancelling
the scan.

Bug: 161500625
Test: Manually tested:
    1. Start scan
    2. Kill ril daemon
    3. Verify that the UI shows an error message
Change-Id: If0047e2471952cb49cbe49659d073b83772ac388
parent c7ce0531

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

+5 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ public final class NetworkScanRequestTracker { 
    private static final int CMD_INTERRUPT_NETWORK_SCAN = 6;

    private static final int EVENT_INTERRUPT_NETWORK_SCAN_DONE = 7;

    private static final int EVENT_MODEM_RESET = 8;

    private static final int EVENT_RADIO_UNAVAILABLE = 9;



    private final Handler mHandler = new Handler() {

        @Override
@@ -102,6 +103,8 @@ public final class NetworkScanRequestTracker { 
                    mScheduler.interruptScanDone((AsyncResult) msg.obj);

                    break;



                case EVENT_RADIO_UNAVAILABLE:

                    // Fallthrough

                case EVENT_MODEM_RESET:

                    AsyncResult ar = (AsyncResult) msg.obj;

                    mScheduler.deleteScanAndMayNotify(
@@ -564,6 +567,7 @@ public final class NetworkScanRequestTracker { 
                nsri.mPhone.startNetworkScan(nsri.getRequest(),

                        mHandler.obtainMessage(EVENT_START_NETWORK_SCAN_DONE, nsri));

                nsri.mPhone.mCi.registerForModemReset(mHandler, EVENT_MODEM_RESET, nsri);

                nsri.mPhone.mCi.registerForNotAvailable(mHandler, EVENT_RADIO_UNAVAILABLE, nsri);

                return true;

            }

            return false;
@@ -584,6 +588,7 @@ public final class NetworkScanRequestTracker { 
                    }

                }

                mLiveRequestInfo.mPhone.mCi.unregisterForModemReset(mHandler);

                mLiveRequestInfo.mPhone.mCi.unregisterForNotAvailable(mHandler);

                mLiveRequestInfo = null;

                if (mPendingRequestInfo != null) {

                    startNewScan(mPendingRequestInfo);