diff options
author | Wink Saville <wink@google.com> | 2012-07-25 17:06:54 -0700 |
---|---|---|
committer | Wink Saville <wink@google.com> | 2012-07-26 11:48:12 -0700 |
commit | 3caf66d2ea63c75039daf43af30d3727e5ce6b58 (patch) | |
tree | fd52035d25a9672f32b6a69209f56f38af071e36 /telephony | |
parent | 10d940d99ff3814cbf4a1b1759a9377b88752f5f (diff) | |
download | frameworks_base-3caf66d2ea63c75039daf43af30d3727e5ce6b58.zip frameworks_base-3caf66d2ea63c75039daf43af30d3727e5ce6b58.tar.gz frameworks_base-3caf66d2ea63c75039daf43af30d3727e5ce6b58.tar.bz2 |
Unhide the new location API's
Change-Id: I41cc89998b8bd1e6686ea30475ab8905a133e312
Diffstat (limited to 'telephony')
14 files changed, 19 insertions, 31 deletions
diff --git a/telephony/java/android/telephony/CellIdentity.java b/telephony/java/android/telephony/CellIdentity.java index 1f4f78e..a3f7860 100644 --- a/telephony/java/android/telephony/CellIdentity.java +++ b/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) { } diff --git a/telephony/java/android/telephony/CellIdentityCdma.java b/telephony/java/android/telephony/CellIdentityCdma.java index 0169d89..fccf98c 100644 --- a/telephony/java/android/telephony/CellIdentityCdma.java +++ b/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 { diff --git a/telephony/java/android/telephony/CellIdentityGsm.java b/telephony/java/android/telephony/CellIdentityGsm.java index f46cd47..dead049 100644 --- a/telephony/java/android/telephony/CellIdentityGsm.java +++ b/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 { diff --git a/telephony/java/android/telephony/CellIdentityLte.java b/telephony/java/android/telephony/CellIdentityLte.java index 3d8532d..832cbe1 100644 --- a/telephony/java/android/telephony/CellIdentityLte.java +++ b/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 { diff --git a/telephony/java/android/telephony/CellInfo.java b/telephony/java/android/telephony/CellInfo.java index 5fdf7c0..1946b5d 100644 --- a/telephony/java/android/telephony/CellInfo.java +++ b/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(); diff --git a/telephony/java/android/telephony/CellInfoCdma.java b/telephony/java/android/telephony/CellInfoCdma.java index 84c1560..1c41ba4 100644 --- a/telephony/java/android/telephony/CellInfoCdma.java +++ b/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 { diff --git a/telephony/java/android/telephony/CellInfoGsm.java b/telephony/java/android/telephony/CellInfoGsm.java index f913569..c644cb3 100644 --- a/telephony/java/android/telephony/CellInfoGsm.java +++ b/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 { diff --git a/telephony/java/android/telephony/CellInfoLte.java b/telephony/java/android/telephony/CellInfoLte.java index 57b0402..8921db2 100644 --- a/telephony/java/android/telephony/CellInfoLte.java +++ b/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 { diff --git a/telephony/java/android/telephony/CellSignalStrength.java b/telephony/java/android/telephony/CellSignalStrength.java index 4ed7dcf..a80207e 100644 --- a/telephony/java/android/telephony/CellSignalStrength.java +++ b/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; @@ -51,6 +51,10 @@ public abstract class CellSignalStrength implements Parcelable { }; /** @hide */ + protected CellSignalStrength() { + } + + /** @hide */ public abstract void setDefaultValues(); /** diff --git a/telephony/java/android/telephony/CellSignalStrengthCdma.java b/telephony/java/android/telephony/CellSignalStrengthCdma.java index ee50fad..20f713b 100644 --- a/telephony/java/android/telephony/CellSignalStrengthCdma.java +++ b/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 { diff --git a/telephony/java/android/telephony/CellSignalStrengthGsm.java b/telephony/java/android/telephony/CellSignalStrengthGsm.java index 70876fb..a311c3c 100644 --- a/telephony/java/android/telephony/CellSignalStrengthGsm.java +++ b/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 { diff --git a/telephony/java/android/telephony/CellSignalStrengthLte.java b/telephony/java/android/telephony/CellSignalStrengthLte.java index 3caea3d..677f713 100644 --- a/telephony/java/android/telephony/CellSignalStrengthLte.java +++ b/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 { diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java index 63d81e9..f3ccae6 100644 --- a/telephony/java/android/telephony/PhoneStateListener.java +++ b/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) { } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 2b0fcd8..15ffd63 100755 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/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 { |