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

Commit a12a1397 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Unexpose getDataRoamingFromRegistration API" into rvc-dev am:... 

Merge "Unexpose getDataRoamingFromRegistration API" into rvc-dev am: 76182efa am: 38cff3b7 am: 70f67f6a

Change-Id: I453ec57c5abc5a0be65dcb92f7964d772ba43af5
parents 4be2e174 70f67f6a

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -11351,7 +11351,6 @@ package android.telephony { 
    method public void fillInNotifierBundle(@NonNull android.os.Bundle);

    method public int getDataNetworkType();

    method public int getDataRegistrationState();

    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
@@ -689,8 +689,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;

    }