diff options
| author | Jack Yu <jackyu@google.com> | 2021-03-31 22:24:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-31 22:24:44 +0000 |
| commit | afefc4e426f384196cf53d3b7e48ceeb08dcef42 (patch) | |
| tree | a2e48e8f3c261ebdb5f3adfc65e4518aa6db557e /core | |
| parent | 5efafd667a3b5838f829176612d234c2bd97c9ac (diff) | |
| parent | ffb09e11c16f27bfe4ced81a69823643b8b1122b (diff) | |
Merge "Moved getId API from system to public" am: ffb09e11c1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640623
Change-Id: I300f50f135c5284638daad955f39cce0ac0c2cba
Diffstat (limited to 'core')
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/api/system-current.txt | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index ef067858c530..bd6b5e877726 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -40412,6 +40412,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 e0de9780a7a1..2928a0c59e8a 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -9795,7 +9795,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 { |