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

Commit 589ee44b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Replace the PHONE_UID with SYSTEM_UID"

parents 9c6951cd 4aba55e6

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

+3 −3
Original line number Diff line number Diff line
@@ -525,12 +525,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 mobile network setting menu (owned by PHONE process)

        //   2. The new scan is requested by mobile network setting menu (owned by SYSTEM 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.PHONE_UID

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

                    && nsri.mUid == Process.SYSTEM_UID

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

                doInterruptScan(mLiveRequestInfo.mScanId);

                mPendingRequestInfo = nsri;

                notifyMessenger(mLiveRequestInfo, TelephonyScanManager.CALLBACK_SCAN_ERROR,