diff options
| author | Rambo Wang <rambowang@google.com> | 2021-10-25 18:14:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-25 18:14:32 +0000 |
| commit | 1c095d14564c8c0da55b4da149d984cef8646d28 (patch) | |
| tree | 5244a2090833965f6485a203745afe60850a7fcc | |
| parent | 3d4a7e57fe975854684574fa2a0e71d77e3bb97d (diff) | |
| parent | 0bacf4f46bc2ba465f81c352f394c12238e8ed14 (diff) | |
| download | base-1c095d14564c8c0da55b4da149d984cef8646d28.tar.gz | |
Merge "Update javadoc of TM#getDataNetworkType to align with implementation"
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 255a61266ebf..a1bed29dec70 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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}). |