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

Commit 30aa266b authored by yinxu's avatar yinxu
Browse files

Use correct UID for network setting menu 

Bug: 67748005
Test: Basic telephony sanity
Change-Id: Id3e6498c52b0f26a19bad66f3c775bae4490c921
parent 89587ddc

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

+4 −4
Original line number Diff line number Diff line
@@ -460,12 +460,12 @@ public final class NetworkScanRequestTracker { 
        // stopped, a new scan will automatically start with nsri.

        // The new scan can interrupt the live scan only when all the below requirements are met:

        //   1. There is 1 live scan and no other pending scan

        //   2. The new scan is requested by system process

        //   3. The live scan is not requested by system process

        //   2. The new scan is requested by mobile network setting menu (owned by PHONE process)

        //   3. The live scan is not requested by mobile network setting menu

        private synchronized boolean interruptLiveScan(NetworkScanRequestInfo nsri) {

            if (mLiveRequestInfo != null && mPendingRequestInfo == null

                    && nsri.mUid == Process.SYSTEM_UID

                            && mLiveRequestInfo.mUid != Process.SYSTEM_UID) {

                    && nsri.mUid == Process.PHONE_UID

                            && mLiveRequestInfo.mUid != Process.PHONE_UID) {

                doInterruptScan(mLiveRequestInfo.mScanId);

                mPendingRequestInfo = nsri;

                notifyMessenger(mLiveRequestInfo, TelephonyScanManager.CALLBACK_SCAN_ERROR,