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

Commit bd95fa3c authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

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

am: a9c04190

Change-Id: I6bc4d056458e7c57729c0b37b7867ad08fe8d637
parents a93e4124 a9c04190

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -436,6 +436,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;
@@ -1220,6 +1221,7 @@ public class ServiceState implements Parcelable { 
    }



    /** @hide */

    @TestApi

    public void setSystemAndNetworkId(int systemId, int networkId) {

        this.mSystemId = systemId;

        this.mNetworkId = networkId;