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

Commit 89a85b06 authored by Ta-wei Yen's avatar Ta-wei Yen Committed by android-build-merger
Browse files

Merge "Add getNetworkSpecifier() and getCarrierConfig()" am: 68d03b23 

am: ea0e1114

Change-Id: Ie40ccdc2ad2a30e8bbf3d6a6c4013ff5faf10cdd
parents 3d12f1b9 ea0e1114

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -37559,6 +37559,7 @@ package android.telephony { 
    method public android.telephony.TelephonyManager createForSubscriptionId(int);

    method public java.util.List<android.telephony.CellInfo> getAllCellInfo();

    method public int getCallState();

    method public android.os.PersistableBundle getCarrierConfig();

    method public android.telephony.CellLocation getCellLocation();

    method public int getDataActivity();

    method public boolean getDataEnabled();
@@ -37576,6 +37577,7 @@ package android.telephony { 
    method public java.lang.String getNetworkCountryIso();

    method public java.lang.String getNetworkOperator();

    method public java.lang.String getNetworkOperatorName();

    method public java.lang.String getNetworkSpecifier();

    method public int getNetworkType();

    method public int getPhoneCount();

    method public int getPhoneType();

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -40748,6 +40748,7 @@ package android.telephony { 
    method public boolean endCall();

    method public java.util.List<android.telephony.CellInfo> getAllCellInfo();

    method public int getCallState();

    method public android.os.PersistableBundle getCarrierConfig();

    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);

    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int);

    method public java.lang.String getCdmaMdn();
@@ -40776,6 +40777,7 @@ package android.telephony { 
    method public java.lang.String getNetworkCountryIso();

    method public java.lang.String getNetworkOperator();

    method public java.lang.String getNetworkOperatorName();

    method public java.lang.String getNetworkSpecifier();

    method public int getNetworkType();

    method public int getPhoneCount();

    method public int getPhoneType();

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -37641,6 +37641,7 @@ package android.telephony { 
    method public android.telephony.TelephonyManager createForSubscriptionId(int);

    method public java.util.List<android.telephony.CellInfo> getAllCellInfo();

    method public int getCallState();

    method public android.os.PersistableBundle getCarrierConfig();

    method public android.telephony.CellLocation getCellLocation();

    method public int getDataActivity();

    method public boolean getDataEnabled();
@@ -37658,6 +37659,7 @@ package android.telephony { 
    method public java.lang.String getNetworkCountryIso();

    method public java.lang.String getNetworkOperator();

    method public java.lang.String getNetworkOperatorName();

    method public java.lang.String getNetworkSpecifier();

    method public int getNetworkType();

    method public int getPhoneCount();

    method public int getPhoneType();

telephony/java/android/telephony/TelephonyManager.java

+29 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.ResultReceiver; 
import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;

import android.os.Bundle;

import android.os.PersistableBundle;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;
@@ -1416,6 +1417,34 @@ public class TelephonyManager { 
        return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_NUMERIC, "");

     }





    /**

     * Returns the network specifier of the subscription ID pinned to the TelephonyManager.

     *

     * @see android.net.NetworkRequest.Builder#setNetworkSpecifier(String)

     * @see #createForSubscriptionId(int)

     * @see #createForPhoneAccountHandle(PhoneAccountHandle)

     */

    public String getNetworkSpecifier() {

        return String.valueOf(mSubId);

    }



    /**

     * Returns the carrier config of the subscription ID pinned to the TelephonyManager.

     *

     * <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE

     * READ_PHONE_STATE}

     *

     * @see CarrierConfigManager#getConfigForSubId(int)

     * @see #createForSubscriptionId(int)

     * @see #createForPhoneAccountHandle(PhoneAccountHandle)

     */

    public PersistableBundle getCarrierConfig() {

        CarrierConfigManager carrierConfigManager = mContext

                .getSystemService(CarrierConfigManager.class);

        return carrierConfigManager.getConfigForSubId(mSubId);

    }



    /**

     * Returns true if the device is considered roaming on the current

     * network, for GSM purposes.