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

Commit f7741924 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Unexpose getDataRoamingFromRegistration API" am: c9252b35 

Change-Id: Iafe65ac0dbe6a89c654ae05e944da4b1c1c2b41c
parents 7567c1aa c9252b35

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -8866,7 +8866,6 @@ package android.telephony { 
  public class ServiceState implements android.os.Parcelable {

    method public void fillInNotifierBundle(@NonNull android.os.Bundle);

    method public int getDataNetworkType();

    method public boolean getDataRoamingFromRegistration();

    method @Nullable public android.telephony.NetworkRegistrationInfo getNetworkRegistrationInfo(int, int);

    method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForDomain(int);

    method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int);

telephony/java/android/telephony/ServiceState.java

+2 −1
Original line number Diff line number Diff line
@@ -688,8 +688,9 @@ public class ServiceState implements Parcelable { 
     * @return true if registration indicates roaming, false otherwise

     * @hide

     */

    @SystemApi

    public boolean getDataRoamingFromRegistration() {

        // TODO: all callers should refactor to get roaming state directly from modem

        // this should not be exposed as a public API

        return mIsDataRoamingFromRegistration;

    }