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

Commit 61dc40ff authored by rambowang's avatar rambowang Committed by Rambo Wang
Browse files

NetworkScanRequestTracker:request with empty RadioAccessSpecifiers is invalid 

NetworkScanRequestTracker validates the request and filters the null
RadioAccessSpecifier array as invalid request. Empty array should
be treated as the same to have consistent API behavior.

Bug: 284020271
Test: atest NetworkScanRequestTrackerTest
Change-Id: Ic553bd630c3e301989762a7a144b80bb08bb7488
parent 7037a7ce

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

+2 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.telephony.TelephonyScanManager; 
import android.util.Log;



import com.android.internal.telephony.subscription.SubscriptionManagerService;

import com.android.internal.util.ArrayUtils;



import java.util.Collection;

import java.util.List;
@@ -131,7 +132,7 @@ public final class NetworkScanRequestTracker { 
    }



    private boolean isValidScan(NetworkScanRequestInfo nsri) {

        if (nsri.mRequest == null || nsri.mRequest.getSpecifiers() == null) {

        if (nsri.mRequest == null || ArrayUtils.isEmpty(nsri.mRequest.getSpecifiers())) {

            return false;

        }

        if (nsri.mRequest.getSpecifiers().length > NetworkScanRequest.MAX_RADIO_ACCESS_NETWORKS) {

tests/telephonytests/src/com/android/internal/telephony/NetworkScanRequestTrackerTest.java

+1 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.testing.TestableLooper; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -117,8 +116,7 @@ public class NetworkScanRequestTrackerTest extends TelephonyTest { 
                .startNetworkScan(any(), any());

    }



    // TODO (b/284020271): turn case back on after fixing the bug

    @Ignore

    @Test

    public void testStartNetworkScan_requestWithEmptySpecifier_shouldNeverScan() throws Exception {

        RadioAccessSpecifier[] specifiers = new RadioAccessSpecifier[]{};

        NetworkScanRequest request = new NetworkScanRequest(