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

Commit ac46358a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Abort the scan when modem becomes unavailable" am: 22ec2ea3 am: 47c39df4 am: 9e5347ee 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1371706

Change-Id: I5ab7d12be8588cd06c60e90d7da621ad2f9e6bf5
parents 2b678e40 9e5347ee

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(
@@ -570,6 +573,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;
@@ -590,6 +594,7 @@ public final class NetworkScanRequestTracker { 
                    }

                }

                mLiveRequestInfo.mPhone.mCi.unregisterForModemReset(mHandler);

                mLiveRequestInfo.mPhone.mCi.unregisterForNotAvailable(mHandler);

                mLiveRequestInfo = null;

                if (mPendingRequestInfo != null) {

                    startNewScan(mPendingRequestInfo);