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

Commit 292fcb94 authored by Rambo Wang's avatar Rambo Wang Committed by Automerger Merge Worker
Browse files

Merge "Update javadoc of TM#getDataNetworkType to align with implementation" am: 1c095d14 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1714756

Change-Id: Ibcd5cc0bea9086f47a4828d7e798b958c539124b
parents f1d8cbb4 1c095d14

telephony/java/android/telephony/TelephonyManager.java

+6 −1
Original line number Diff line number Diff line
@@ -2945,7 +2945,12 @@ public class TelephonyManager { 
     * currently in use on the device for data transmission.

     *

     * If this object has been created with {@link #createForSubscriptionId}, applies to the given

     * subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}

     * subId. Otherwise, applies to {@link SubscriptionManager#getActiveDataSubscriptionId()}.

     *

     * Note: Before {@link SubscriptionManager#getActiveDataSubscriptionId()} was introduced in API

     * level 30, it was applied to {@link SubscriptionManager#getDefaultDataSubscriptionId()} which

     * may be different now from {@link SubscriptionManager#getActiveDataSubscriptionId()}, e.g.

     * when opportunistic network is providing cellular internet connection to the user.

     *

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

     * or that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).