Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update javadoc of TM#getDataNetworkType to align with implementation" am: 1c095d1456 am: 292fcb946f

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

Change-Id: I67361127ba2cdbd853e86d72b0b9b229dfd6e132
This commit is contained in:
Rambo Wang
2021-10-25 18:44:04 +00:00
committed by Automerger Merge Worker
parent 395496ff6a 292fcb946f
commit 3c0336d958
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -2945,7 +2945,12 @@ public class TelephonyManager {
* currently in use on the device for data transmission. * currently in use on the device for data transmission.
* *
* If this object has been created with {@link #createForSubscriptionId}, applies to the given * 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} * <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
* or that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}). * or that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).