Merge "Make APIs in the base CellInfo class public."
diff --git a/api/current.txt b/api/current.txt
index 9a44366..6a7b53f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -44465,6 +44465,8 @@
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 7edc91c..18687d4 100644
--- a/telephony/java/android/telephony/CellInfo.java
+++ b/telephony/java/android/telephony/CellInfo.java
@@ -189,11 +189,15 @@
mTimeStamp = ts;
}
- /** @hide */
+ /**
+ * @return a {@link CellIdentity} instance.
+ */
@NonNull
public abstract CellIdentity getCellIdentity();
- /** @hide */
+ /**
+ * @return a {@link CellSignalStrength} instance.
+ */
@NonNull
public abstract CellSignalStrength getCellSignalStrength();