summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jack Yu <jackyu@google.com> 2021-03-16 15:30:40 -0700
committer Jack Yu <jackyu@google.com> 2021-03-19 20:33:40 +0000
commit6a33ee19a7e9329f24fd7c56e96b61834f6b6d08 (patch)
tree44ca670f90d27b8dcb946ef8a055376df9c53f6c
parenteccbfe4b721a57723a2a6d349fff3508501d8ffb (diff)
Moved getId API from system to public
Fix: 169641293 Test: Build Change-Id: I5e766c8d30bbaf9010bc4a1bc621b0db6f988cc8
-rw-r--r--core/api/current.txt1
-rw-r--r--core/api/system-current.txt1
-rw-r--r--telephony/java/android/telephony/PreciseDataConnectionState.java4
3 files changed, 2 insertions, 4 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index 28d492c70f09..5e4dc1cc597a 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -40487,6 +40487,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 getId();
method public int getLastCauseCode();
method @Nullable public android.net.LinkProperties getLinkProperties();
method public int getNetworkType();
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 7f8d68ac5206..faf716978613 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -9758,7 +9758,6 @@ package android.telephony {
method @Deprecated public int getDataConnectionApnTypeBitMask();
method @Deprecated public int getDataConnectionFailCause();
method @Deprecated public int getDataConnectionState();
- method public int getId();
}
public final class PreciseDisconnectCause {
diff --git a/telephony/java/android/telephony/PreciseDataConnectionState.java b/telephony/java/android/telephony/PreciseDataConnectionState.java
index 9ea624b60988..ce2f3f924554 100644
--- a/telephony/java/android/telephony/PreciseDataConnectionState.java
+++ b/telephony/java/android/telephony/PreciseDataConnectionState.java
@@ -166,14 +166,12 @@ public final class PreciseDataConnectionState implements Parcelable {
/**
* @return The unique id of the data connection
*
- * Note this is the id assigned in {@link DataCallResponse}.
+ * Note this is the id assigned by the data service.
* The id remains the same for data connection handover between
* {@link AccessNetworkConstants#TRANSPORT_TYPE_WLAN} and
* {@link AccessNetworkConstants#TRANSPORT_TYPE_WWAN}
*
- * @hide
*/
- @SystemApi
public int getId() {
return mId;
}