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

Commit c834e855 authored by Sooraj Sasindran's avatar Sooraj Sasindran
Browse files

Fix testNetworkScanRequestParcel_Parcel CTS 

Allow mSpecifiers to be null in case the length of the specifier array
is less than null

Bug: 146363437
Test: Ran CTS

cts-tradefed run cts -m CtsCarrierApiTestCases --test android.carrierapi.cts.NetworkScanApiTest

Merged-In: Iad7d91d8813415bbd2f3b6cad02120e59441e08a
Change-Id: Iad7d91d8813415bbd2f3b6cad02120e59441e08a
parent 02f70c74

telephony/java/android/telephony/NetworkScanRequest.java

+7 −3
Original line number Diff line number Diff line
@@ -222,10 +222,14 @@ public final class NetworkScanRequest implements Parcelable { 
    private NetworkScanRequest(Parcel in) {

        mScanType = in.readInt();

        Parcelable[] tempSpecifiers = in.readParcelableArray(Object.class.getClassLoader());

        if (tempSpecifiers != null) {

            mSpecifiers = new RadioAccessSpecifier[tempSpecifiers.length];

            for (int i = 0; i < tempSpecifiers.length; i++) {

                mSpecifiers[i] = (RadioAccessSpecifier) tempSpecifiers[i];

            }

        } else {

            mSpecifiers = null;

        }

        mSearchPeriodicity = in.readInt();

        mMaxSearchTime = in.readInt();

        mIncrementalResults = in.readBoolean();