am 97425536: Merge "Unhide the new location API\'s" into jb-mr1-dev

* commit '9742553603af071b5087df3e352e2ad4ac1d382f':
  Unhide the new location API's

api/current.txt

@@ -20208,12 +20208,110 @@ package android.speech.tts {
 
 package android.telephony {
 
+  public abstract class CellIdentity implements android.os.Parcelable {
+    method public int describeContents();
+    method public abstract int hashCode();
+    method public void writeToParcel(android.os.Parcel, int);
+    field public static final android.os.Parcelable.Creator CREATOR;
+  }
+
+  public final class CellIdentityCdma extends android.telephony.CellIdentity implements android.os.Parcelable {
+    method public int getBasestationId();
+    method public int getLatitude();
+    method public int getLongitude();
+    method public int getNetworkId();
+    method public int getSystemId();
+    method public int hashCode();
+    field public static final android.os.Parcelable.Creator CREATOR;
+  }
+
+  public final class CellIdentityGsm extends android.telephony.CellIdentity implements android.os.Parcelable {
+    method public int getCid();
+    method public int getLac();
+    method public int getMcc();
+    method public int getMnc();
+    method public int getPsc();
+    method public int hashCode();
+    field public static final android.os.Parcelable.Creator CREATOR;
+  }
+
+  public final class CellIdentityLte extends android.telephony.CellIdentity implements android.os.Parcelable {
+    method public int getCi();
+    method public int getMcc();
+    method public int getMnc();
+    method public int getPci();
+    method public int getTac();
+    method public int hashCode();
+    field public static final android.os.Parcelable.Creator CREATOR;
+  }
+
+  public class CellInfo implements android.os.Parcelable {
+    method public int describeContents();
+    method public long getTimeStamp();
+    method public boolean isRegistered();
+    method public void writeToParcel(android.os.Parcel, int);
+    field public static final android.os.Parcelable.Creator CREATOR;
+  }
+
+  public final class CellInfoCdma extends android.telephony.CellInfo implements android.os.Parcelable {
+    method public android.telephony.CellIdentityCdma getCellIdentity();
+    method public android.telephony.CellSignalStrengthCdma getCellSignalStrength();
+    field public static final android.os.Parcelable.Creator CREATOR;
+  }
+
+  public final class CellInfoGsm extends android.telephony.CellInfo implements android.os.Parcelable {
+    method public android.telephony.CellIdentityGsm getCellIdentity();
+    method public android.telephony.CellSignalStrengthGsm getCellSignalStrength();
+    field public static final android.os.Parcelable.Creator CREATOR;
+  }
+
+  public final class CellInfoLte extends android.telephony.CellInfo implements android.os.Parcelable {
+    method public android.telephony.CellIdentityLte getCellIdentity();
+    method public android.telephony.CellSignalStrengthLte getCellSignalStrength();
+    field public static final android.os.Parcelable.Creator CREATOR;
+  }
+
   public abstract class CellLocation {
     ctor public CellLocation();
     method public static android.telephony.CellLocation getEmpty();
     method public static void requestLocationUpdate();
   }
 
+  public abstract class CellSignalStrength implements android.os.Parcelable {
+    method public int describeContents();
+    method public abstract boolean equals(java.lang.Object);
+    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 getCdmaDbm();
+    method public int getCdmaEcio();
+    method public int getEvdoDbm();
+    method public int getEvdoEcio();
+    method public int getEvdoSnr();
+    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 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 getTimingAdvance();
+    method public int hashCode();
+    method public void writeToParcel(android.os.Parcel, int);
+    field public static final android.os.Parcelable.Creator CREATOR;
+  }
+
   public class NeighboringCellInfo implements android.os.Parcelable {
     ctor public deprecated NeighboringCellInfo();
     ctor public deprecated NeighboringCellInfo(int, int);
@@ -20286,6 +20384,7 @@ package android.telephony {
     ctor public PhoneStateListener();
     method public void onCallForwardingIndicatorChanged(boolean);
     method public void onCallStateChanged(int, java.lang.String);
+    method public void onCellInfoChanged(java.util.List<android.telephony.CellInfo>);
     method public void onCellLocationChanged(android.telephony.CellLocation);
     method public void onDataActivity(int);
     method public void onDataConnectionStateChanged(int);
@@ -20296,6 +20395,7 @@ package android.telephony {
     method public void onSignalStrengthsChanged(android.telephony.SignalStrength);
     field public static final int LISTEN_CALL_FORWARDING_INDICATOR = 8; // 0x8
     field public static final int LISTEN_CALL_STATE = 32; // 0x20
+    field public static final int LISTEN_CELL_INFO = 1024; // 0x400
     field public static final int LISTEN_CELL_LOCATION = 16; // 0x10
     field public static final int LISTEN_DATA_ACTIVITY = 128; // 0x80
     field public static final int LISTEN_DATA_CONNECTION_STATE = 64; // 0x40
@@ -20421,6 +20521,7 @@ package android.telephony {
   }
 
   public class TelephonyManager {
+    method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
     method public int getCallState();
     method public android.telephony.CellLocation getCellLocation();
     method public int getDataActivity();

telephony/java/android/telephony/CellIdentity.java

@@ -22,22 +22,26 @@ import android.os.Parcelable;
 /**
  * CellIdentity is immutable and represents ONE unique cell in the world
  * it contains all levels of info to identity country, carrier, etc.
- *
- * @hide
  */
 public abstract class CellIdentity implements Parcelable {
 
     // Type fields for parceling
+    /** @hide */
     protected static final int TYPE_GSM = 1;
+    /** @hide */
     protected static final int TYPE_CDMA = 2;
+    /** @hide */
     protected static final int TYPE_LTE = 3;
 
+    /** @hide */
     protected CellIdentity() {
     }
 
+    /** @hide */
     protected CellIdentity(Parcel in) {
     }
 
+    /** @hide */
     protected CellIdentity(CellIdentity cid) {
     }
 

telephony/java/android/telephony/CellIdentityCdma.java

@@ -22,8 +22,6 @@ import android.util.Log;
 
 /**
  * CellIdentity is to represent a unique CDMA cell
- *
- * @hide
  */
 public final class CellIdentityCdma extends CellIdentity implements Parcelable {
 

telephony/java/android/telephony/CellIdentityGsm.java

@@ -22,8 +22,6 @@ import android.util.Log;
 
 /**
  * CellIdentity to represent a unique GSM or UMTS cell
- *
- * @hide
  */
 public final class CellIdentityGsm extends CellIdentity implements Parcelable {
 

telephony/java/android/telephony/CellIdentityLte.java

@@ -22,8 +22,6 @@ import android.util.Log;
 
 /**
  * CellIdentity is to represent a unique LTE cell
- *
- * @hide
  */
 public final class CellIdentityLte extends CellIdentity implements Parcelable {
 

telephony/java/android/telephony/CellInfo.java

@@ -21,14 +21,15 @@ import android.os.Parcelable;
 
 /**
  * Immutable cell information from a point in time.
- *
- * @hide
  */
 public class CellInfo implements Parcelable {
 
     // Type fields for parceling
+    /** @hide */
     protected static final int TYPE_GSM = 1;
+    /** @hide */
     protected static final int TYPE_CDMA = 2;
+    /** @hide */
     protected static final int TYPE_LTE = 3;
 
     // Type to distinguish where time stamp gets recorded.
@@ -54,12 +55,14 @@ public class CellInfo implements Parcelable {
     // Value of TIMESTAMP_TYPE_XXXX
     private int mTimeStampType;
 
+    /** @hide */
     protected CellInfo() {
         this.mRegistered = false;
         this.mTimeStampType = TIMESTAMP_TYPE_UNKNOWN;
         this.mTimeStamp = Long.MAX_VALUE;
     }
 
+    /** @hide */
     protected CellInfo(CellInfo ci) {
         this.mRegistered = ci.mRegistered;
         this.mTimeStampType = ci.mTimeStampType;
@@ -168,6 +171,7 @@ public class CellInfo implements Parcelable {
         dest.writeLong(mTimeStamp);
     }
 
+    /** @hide */
     protected CellInfo(Parcel in) {
         mRegistered = (in.readInt() == 1) ? true : false;
         mTimeStampType = in.readInt();

telephony/java/android/telephony/CellInfoCdma.java

@@ -22,8 +22,6 @@ import android.util.Log;
 
 /**
  * Immutable cell information from a point in time.
- *
- * @hide
  */
 public final class CellInfoCdma extends CellInfo implements Parcelable {
 

telephony/java/android/telephony/CellInfoGsm.java

@@ -22,8 +22,6 @@ import android.util.Log;
 
 /**
  * Immutable cell information from a point in time.
- *
- * @hide
  */
 public final class CellInfoGsm extends CellInfo implements Parcelable {
 

telephony/java/android/telephony/CellInfoLte.java

@@ -22,8 +22,6 @@ import android.util.Log;
 
 /**
  * Immutable cell information from a point in time.
- *
- * @hide
  */
 public final class CellInfoLte extends CellInfo implements Parcelable {
 

telephony/java/android/telephony/CellSignalStrength.java

@@ -18,18 +18,18 @@ package android.telephony;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.view.InputEvent;
 
 /**
  * Abstract base class for cell phone signal strength related information.
- *
- * @hide
  */
 public abstract class CellSignalStrength implements Parcelable {
 
     // Type fields for parceling
+    /** @hide */
     protected static final int TYPE_GSM = 1;
+    /** @hide */
     protected static final int TYPE_CDMA = 2;
+    /** @hide */
     protected static final int TYPE_LTE = 3;
 
 
@@ -50,6 +50,10 @@ public abstract class CellSignalStrength implements Parcelable {
         "none", "poor", "moderate", "good", "great"
     };
 
+    /** @hide */
+    protected CellSignalStrength() {
+    }
+
     /** @hide */
     public abstract void setDefaultValues();
 

telephony/java/android/telephony/CellSignalStrengthCdma.java

@@ -22,8 +22,6 @@ import android.util.Log;
 
 /**
  * LTE signal strength related information.
- *
- * @hide
  */
 public class CellSignalStrengthCdma extends CellSignalStrength implements Parcelable {
 

telephony/java/android/telephony/CellSignalStrengthGsm.java

@@ -22,8 +22,6 @@ import android.util.Log;
 
 /**
  * LTE signal strength related information.
- *
- * @hide
  */
 public class CellSignalStrengthGsm extends CellSignalStrength implements Parcelable {
 

telephony/java/android/telephony/CellSignalStrengthLte.java

@@ -22,8 +22,6 @@ import android.util.Log;
 
 /**
  * LTE signal strength related information.
- *
- * @hide
  */
 public class CellSignalStrengthLte extends CellSignalStrength implements Parcelable {
 

telephony/java/android/telephony/PhoneStateListener.java

@@ -162,8 +162,6 @@ public class PhoneStateListener {
      * Listen for changes to observed cell info.
      *
      * @see #onCellInfoChanged
-     *
-     * @hide
      */
     public static final int LISTEN_CELL_INFO = 0x00000400;
 
@@ -290,8 +288,6 @@ public class PhoneStateListener {
      * Callback invoked when a observed cell info has changed,
      * or new cells have been added or removed.
      * @param cellInfo is the list of currently visible cells.
-     *
-     * @hide
      */
     public void onCellInfoChanged(List<CellInfo> cellInfo) {
     }

telephony/java/android/telephony/TelephonyManager.java

@@ -1271,8 +1271,6 @@ public class TelephonyManager {
      *
      * <p>Requires Permission:
      * (@link android.Manifest.permission#ACCESS_COARSE_UPDATES}
-     *
-     * @hide
      */
     public List<CellInfo> getAllCellInfo() {
         try {