Merge "Unhide some CellSignalStrength methods." into jb-mr1-dev

Author: Wink Saville

api/current.txt

@@ -20439,32 +20439,46 @@ package android.telephony {
   public abstract class CellSignalStrength implements android.os.Parcelable {
     method public int describeContents();
     method public abstract boolean equals(java.lang.Object);
+    method public abstract int getAsuLevel();
+    method public abstract int getDbm();
+    method public abstract int getLevel();
     method public abstract int hashCode();
     method public abstract void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator CREATOR;
   }
 
   public class CellSignalStrengthCdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {
     method public boolean equals(java.lang.Object);
+    method public int getAsuLevel();
     method public int getCdmaDbm();
     method public int getCdmaEcio();
+    method public int getCdmaLevel();
+    method public int getDbm();
     method public int getEvdoDbm();
     method public int getEvdoEcio();
+    method public int getEvdoLevel();
     method public int getEvdoSnr();
+    method public int getLevel();
     method public int hashCode();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator CREATOR;
   }
 
   public class CellSignalStrengthGsm extends android.telephony.CellSignalStrength implements android.os.Parcelable {
     method public boolean equals(java.lang.Object);
+    method public int getAsuLevel();
+    method public int getDbm();
+    method public int getLevel();
     method public int hashCode();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator CREATOR;
   }
 
   public class CellSignalStrengthLte extends android.telephony.CellSignalStrength implements android.os.Parcelable {
     method public boolean equals(java.lang.Object);
+    method public int getAsuLevel();
+    method public int getDbm();
+    method public int getLevel();
     method public int getTimingAdvance();
     method public int hashCode();
     method public void writeToParcel(android.os.Parcel, int);

telephony/java/android/telephony/CellSignalStrength.java

@@ -59,22 +59,16 @@ protected CellSignalStrength() {
 
     /**
      * Get signal level as an int from 0..4
-     *
-     * @hide
      */
     public abstract int getLevel();
 
     /**
      * Get the signal level as an asu value between 0..31, 99 is unknown
-     *
-     * @hide
      */
     public abstract int getAsuLevel();
 
     /**
      * Get the signal strength as dBm
-     *
-     * @hide
      */
     public abstract int getDbm();
 

telephony/java/android/telephony/CellSignalStrengthCdma.java

@@ -113,9 +113,7 @@ public void setDefaultValues() {
     }
 
     /**
-     * Get LTE as level 0..4
-     *
-     * @hide
+     * Get signal level as an int from 0..4
      */
     @Override
     public int getLevel() {
@@ -140,8 +138,6 @@ public int getLevel() {
     /**
      * Get the LTE signal level as an asu value between 0..97, 99 is unknown
      * Asu is calculated based on 3GPP RSRP. Refer to 3GPP 27.007 (Ver 10.3.0) Sec 8.69
-     *
-     * @hide
      */
     @Override
     public int getAsuLevel() {
@@ -172,8 +168,6 @@ public int getAsuLevel() {
 
     /**
      * Get cdma as level 0..4
-     *
-     * @hide
      */
     public int getCdmaLevel() {
         final int cdmaDbm = getCdmaDbm();
@@ -201,8 +195,6 @@ public int getCdmaLevel() {
 
     /**
      * Get Evdo as level 0..4
-     *
-     * @hide
      */
     public int getEvdoLevel() {
         int evdoDbm = getEvdoDbm();
@@ -228,9 +220,7 @@ public int getEvdoLevel() {
     }
 
     /**
-     * Get as dBm
-     *
-     * @hide
+     * Get the signal strength as dBm
      */
     @Override
     public int getDbm() {

telephony/java/android/telephony/CellSignalStrengthGsm.java

@@ -100,9 +100,7 @@ public void setDefaultValues() {
     }
 
     /**
-     * Get LTE as level 0..4
-     *
-     * @hide
+     * Get signal level as an int from 0..4
      */
     @Override
     public int getLevel() {
@@ -123,9 +121,7 @@ public int getLevel() {
     }
 
     /**
-     * Get LTE as dBm
-     *
-     * @hide
+     * Get the signal strength as dBm
      */
     @Override
     public int getDbm() {
@@ -145,8 +141,6 @@ public int getDbm() {
     /**
      * Get the LTE signal level as an asu value between 0..97, 99 is unknown
      * Asu is calculated based on 3GPP RSRP. Refer to 3GPP 27.007 (Ver 10.3.0) Sec 8.69
-     *
-     * @hide
      */
     @Override
     public int getAsuLevel() {

telephony/java/android/telephony/CellSignalStrengthLte.java

@@ -134,9 +134,7 @@ public void setDefaultValues() {
     }
 
     /**
-     * Get LTE as level 0..4
-     *
-     * @hide
+     * Get signal level as an int from 0..4
      */
     @Override
     public int getLevel() {
@@ -170,9 +168,7 @@ else if (mRssnr == Integer.MAX_VALUE)
     }
 
     /**
-     * Get LTE as dBm
-     *
-     * @hide
+     * Get signal strength as dBm
      */
     @Override
     public int getDbm() {
@@ -182,8 +178,6 @@ public int getDbm() {
     /**
      * Get the LTE signal level as an asu value between 0..97, 99 is unknown
      * Asu is calculated based on 3GPP RSRP. Refer to 3GPP 27.007 (Ver 10.3.0) Sec 8.69
-     *
-     * @hide
      */
     @Override
     public int getAsuLevel() {