Merge "Range Check CarrierDisplayNameData Constructor" into main

import android.os.Parcel;

import android.os.Parcelable;

import android.telephony.Rlog;

import java.util.Objects;

 * A container of carrier display name.

 */

public class CarrierDisplayNameData implements Parcelable {

    private static String LOG_TAG = "CarrierDisplayNameData";

    /** Service provider name. */

    private final String mSpn;

    /** {@code True} if display PLMN network name is required. */

    private final boolean mShowPlmn;

    private CarrierDisplayNameData(String spn, String dataSpn, boolean showSpn, String plmn,

            boolean showPlmn) {

    private CarrierDisplayNameData(

            String spn, String dataSpn, boolean showSpn, String plmn, boolean showPlmn) {

        final String logString = "Data SPN must be provided if SPN is provided";

        if (spn != null && dataSpn == null) {

            Rlog.e(LOG_TAG, logString);

            if (android.os.Build.isDebuggable()) {

                throw new IllegalArgumentException(logString);

            } else {

                dataSpn = spn;

            }

        }

        this.mSpn = spn;

        this.mDataSpn = dataSpn;

        this.mShowSpn = showSpn;

import static com.google.common.truth.Truth.assertThat;

import static org.junit.Assert.fail;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.doReturn;

import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.mockito.Mockito;

public class CarrierDisplayNameResolverTest extends TelephonyTest {

        assertThat(data.shouldShowPlmn()).isTrue();

        assertThat(data.getPlmn()).isEqualTo(HOME_PLMN_NUMERIC);

    }

    @Test

    public void testCarrierDisplayNameData_enforceNonNullDataSpn() {

        try {

            CarrierDisplayNameData cdnd = new CarrierDisplayNameData.Builder()

                    .setSpn("testSpn").build();

            fail("Expected IAE");

        } catch(IllegalArgumentException expected) {

        }

    }

}