From b1a17ee1c4a596f2dfe3361a9c30740a55ddb202 Mon Sep 17 00:00:00 2001
From: Amit Mahajan <amitmahajan@google.com>
Date: Wed, 9 Oct 2019 17:04:25 -0700
Subject: [PATCH] Make APIs in the base CellInfo class public.

Test: build
Bug: 139417139
Merged-in: I591c500136ac1f28d9cb87cd1649fd891e1315f6
Change-Id: I591c500136ac1f28d9cb87cd1649fd891e1315f6
(cherry picked from commit 54e43e65e03803390c418b9b4b83cd8f2dd6430f)
---
 api/current.txt                                | 2 ++
 telephony/java/android/telephony/CellInfo.java | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index cd6ec95cd162e..4a86f6eaa77c1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -44295,6 +44295,8 @@ package android.telephony {
   public abstract class CellInfo implements android.os.Parcelable {
     method public int describeContents();
     method public int getCellConnectionStatus();
+    method @NonNull public abstract android.telephony.CellIdentity getCellIdentity();
+    method @NonNull public abstract android.telephony.CellSignalStrength getCellSignalStrength();
     method public long getTimeStamp();
     method public boolean isRegistered();
     field public static final int CONNECTION_NONE = 0; // 0x0
diff --git a/telephony/java/android/telephony/CellInfo.java b/telephony/java/android/telephony/CellInfo.java
index 7edc91cd67e80..18687d400faf0 100644
--- a/telephony/java/android/telephony/CellInfo.java
+++ b/telephony/java/android/telephony/CellInfo.java
@@ -189,11 +189,15 @@ public abstract class CellInfo implements Parcelable {
         mTimeStamp = ts;
     }
 
-    /** @hide */
+    /**
+     * @return a {@link CellIdentity} instance.
+     */
     @NonNull
     public abstract CellIdentity getCellIdentity();
 
-    /** @hide */
+    /**
+     * @return a {@link CellSignalStrength} instance.
+     */
     @NonNull
     public abstract CellSignalStrength getCellSignalStrength();