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

Commit 3d41837c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12378824 from bbaac5a7 to 24Q4-release 

Change-Id: I77d45fd8f0c135e619b16195352f8751eee2c1a3
parents 7a443976 bbaac5a7

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

+3 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.os.Message; 
import android.os.Messenger;

import android.os.Process;

import android.os.RemoteException;

import android.os.UserHandle;

import android.telephony.CellInfo;

import android.telephony.LocationAccessPolicy;

import android.telephony.NetworkScan;
@@ -567,8 +568,8 @@ public final class NetworkScanRequestTracker { 
        //   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) {

                    && UserHandle.isSameApp(nsri.mUid, Process.SYSTEM_UID)

                            && !UserHandle.isSameApp(mLiveRequestInfo.mUid, Process.SYSTEM_UID)) {

                doInterruptScan(mLiveRequestInfo.mScanId);

                mPendingRequestInfo = nsri;

                notifyMessenger(mLiveRequestInfo, TelephonyScanManager.CALLBACK_SCAN_ERROR,