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

Commit a2f01c94 authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Deprecate getNetworkType" am: d47ae010 am: 40ae3d62 am: 9d8c21fb 

am: ebcb57fb

Change-Id: I06080b5536c8bdf3cbdf8c8351b202e892ca36f9
parents 86ffd08b ebcb57fb

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -44937,7 +44937,7 @@ package android.telephony { 
    method public String getNetworkOperator();

    method public String getNetworkOperatorName();

    method public String getNetworkSpecifier();

    method public int getNetworkType();

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getNetworkType();

    method public int getPhoneCount();

    method public int getPhoneType();

    method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PHONE_STATE}) public int getPreferredOpportunisticDataSubscription();

telephony/java/android/telephony/TelephonyManager.java

+5 −0
Original line number Diff line number Diff line
@@ -2512,8 +2512,13 @@ public class TelephonyManager { 
    public @interface NetworkType{}



    /**

     * Return the current data network type.

     *

     * @deprecated use {@link #getDataNetworkType()}

     * @return the NETWORK_TYPE_xxxx for current data connection.

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    public @NetworkType int getNetworkType() {

        return getNetworkType(getSubId(SubscriptionManager.getDefaultDataSubscriptionId()));

    }