From 6a33ee19a7e9329f24fd7c56e96b61834f6b6d08 Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Tue, 16 Mar 2021 15:30:40 -0700
Subject: [PATCH] Moved getId API from system to public

Fix: 169641293
Test: Build
Change-Id: I5e766c8d30bbaf9010bc4a1bc621b0db6f988cc8
---
 core/api/current.txt                                          | 1 +
 core/api/system-current.txt                                   | 1 -
 .../java/android/telephony/PreciseDataConnectionState.java    | 4 +---
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 28d492c70f09d..5e4dc1cc597af 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 7f8d68ac5206b..faf716978613a 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 9ea624b609884..ce2f3f9245546 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;
     }