From ca2e76571ec9947d86f1419f4e7802c9ebef0fd7 Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Wed, 29 Jan 2020 16:17:22 -0800 Subject: [PATCH] Expose PreciseDataConnectionstate#getApnSetting() Expose an API that was accidentally left as package private. This is was missed when exposing other methods for the same class; however, other methods have been deprecated based on the presumption that this method is available in the public API. This method deprecated: PreciseDataConnectionState#getDataConnectionApnTypeBitMask() PreciseDataConnectionState#getDataConnectionApn() Bug: 148565164 Bug: 147600208 Test: make update-api && make offline-sdk-docs Merged-In: I0207c18d853d0b83db2622ff3abcda98565eac30 Change-Id: I0207c18d853d0b83db2622ff3abcda98565eac30 (cherry picked from commit a61992b67adf0180a073da5820826c27fd8d5e88) --- api/current.txt | 1 + .../java/android/telephony/PreciseDataConnectionState.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index f3204caef817f..5598dcc6e8bf4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -45516,6 +45516,7 @@ package android.telephony { public final class PreciseDataConnectionState implements android.os.Parcelable { method public int describeContents(); + method @Nullable public android.telephony.data.ApnSetting getApnSetting(); method public int getLastCauseCode(); method @Nullable public android.net.LinkProperties getLinkProperties(); method public int getNetworkType(); diff --git a/telephony/java/android/telephony/PreciseDataConnectionState.java b/telephony/java/android/telephony/PreciseDataConnectionState.java index 54c22ae282fb2..708adebb6db34 100644 --- a/telephony/java/android/telephony/PreciseDataConnectionState.java +++ b/telephony/java/android/telephony/PreciseDataConnectionState.java @@ -265,10 +265,10 @@ public final class PreciseDataConnectionState implements Parcelable { /** * Return the APN Settings for this data connection. * - * Returns the ApnSetting that was used to configure this data connection. + * @return the ApnSetting that was used to configure this data connection. */ // FIXME: This shouldn't be nullable; update once the ApnSetting is supplied correctly - @Nullable ApnSetting getApnSetting() { + public @Nullable ApnSetting getApnSetting() { return mApnSetting; }