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

Commit 3a3bb157 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Added CTS test cases for getNetworkId() and getSystemId()"

parents b9cacbea 1b8b3892

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -732,6 +732,10 @@ package android.telephony { 
    field public static final java.lang.String MBMS_STREAMING_SERVICE_OVERRIDE_METADATA = "mbms-streaming-service-override";

  }



  public class ServiceState implements android.os.Parcelable {

    method public void setSystemAndNetworkId(int, int);

  }



}



package android.telephony.mbms {

telephony/java/android/telephony/ServiceState.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.telephony; 
import android.annotation.IntDef;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.os.Bundle;

import android.os.Parcel;

import android.os.Parcelable;
@@ -1215,6 +1216,7 @@ public class ServiceState implements Parcelable { 
    }



    /** @hide */

    @TestApi

    public void setSystemAndNetworkId(int systemId, int networkId) {

        this.mSystemId = systemId;

        this.mNetworkId = networkId;