Skip to content

Commit 9742553

Browse files
Wink SavilleAndroid (Google) Code Review
Wink Saville
authored and
Android (Google) Code Review
committed
Merge "Unhide the new location API's" into jb-mr1-dev
2 parents 800dd9b + 3caf66d commit 9742553

15 files changed

+120
-31
lines changed

‎api/current.txt‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20208,12 +20208,110 @@ package android.speech.tts {
2020820208

2020920209
package android.telephony {
2021020210

20211+
public abstract class CellIdentity implements android.os.Parcelable {
20212+
method public int describeContents();
20213+
method public abstract int hashCode();
20214+
method public void writeToParcel(android.os.Parcel, int);
20215+
field public static final android.os.Parcelable.Creator CREATOR;
20216+
}
20217+
20218+
public final class CellIdentityCdma extends android.telephony.CellIdentity implements android.os.Parcelable {
20219+
method public int getBasestationId();
20220+
method public int getLatitude();
20221+
method public int getLongitude();
20222+
method public int getNetworkId();
20223+
method public int getSystemId();
20224+
method public int hashCode();
20225+
field public static final android.os.Parcelable.Creator CREATOR;
20226+
}
20227+
20228+
public final class CellIdentityGsm extends android.telephony.CellIdentity implements android.os.Parcelable {
20229+
method public int getCid();
20230+
method public int getLac();
20231+
method public int getMcc();
20232+
method public int getMnc();
20233+
method public int getPsc();
20234+
method public int hashCode();
20235+
field public static final android.os.Parcelable.Creator CREATOR;
20236+
}
20237+
20238+
public final class CellIdentityLte extends android.telephony.CellIdentity implements android.os.Parcelable {
20239+
method public int getCi();
20240+
method public int getMcc();
20241+
method public int getMnc();
20242+
method public int getPci();
20243+
method public int getTac();
20244+
method public int hashCode();
20245+
field public static final android.os.Parcelable.Creator CREATOR;
20246+
}
20247+
20248+
public class CellInfo implements android.os.Parcelable {
20249+
method public int describeContents();
20250+
method public long getTimeStamp();
20251+
method public boolean isRegistered();
20252+
method public void writeToParcel(android.os.Parcel, int);
20253+
field public static final android.os.Parcelable.Creator CREATOR;
20254+
}
20255+
20256+
public final class CellInfoCdma extends android.telephony.CellInfo implements android.os.Parcelable {
20257+
method public android.telephony.CellIdentityCdma getCellIdentity();
20258+
method public android.telephony.CellSignalStrengthCdma getCellSignalStrength();
20259+
field public static final android.os.Parcelable.Creator CREATOR;
20260+
}
20261+
20262+
public final class CellInfoGsm extends android.telephony.CellInfo implements android.os.Parcelable {
20263+
method public android.telephony.CellIdentityGsm getCellIdentity();
20264+
method public android.telephony.CellSignalStrengthGsm getCellSignalStrength();
20265+
field public static final android.os.Parcelable.Creator CREATOR;
20266+
}
20267+
20268+
public final class CellInfoLte extends android.telephony.CellInfo implements android.os.Parcelable {
20269+
method public android.telephony.CellIdentityLte getCellIdentity();
20270+
method public android.telephony.CellSignalStrengthLte getCellSignalStrength();
20271+
field public static final android.os.Parcelable.Creator CREATOR;
20272+
}
20273+
2021120274
public abstract class CellLocation {
2021220275
ctor public CellLocation();
2021320276
method public static android.telephony.CellLocation getEmpty();
2021420277
method public static void requestLocationUpdate();
2021520278
}
2021620279

20280+
public abstract class CellSignalStrength implements android.os.Parcelable {
20281+
method public int describeContents();
20282+
method public abstract boolean equals(java.lang.Object);
20283+
method public abstract int hashCode();
20284+
method public abstract void writeToParcel(android.os.Parcel, int);
20285+
field public static final android.os.Parcelable.Creator CREATOR;
20286+
}
20287+
20288+
public class CellSignalStrengthCdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {
20289+
method public boolean equals(java.lang.Object);
20290+
method public int getCdmaDbm();
20291+
method public int getCdmaEcio();
20292+
method public int getEvdoDbm();
20293+
method public int getEvdoEcio();
20294+
method public int getEvdoSnr();
20295+
method public int hashCode();
20296+
method public void writeToParcel(android.os.Parcel, int);
20297+
field public static final android.os.Parcelable.Creator CREATOR;
20298+
}
20299+
20300+
public class CellSignalStrengthGsm extends android.telephony.CellSignalStrength implements android.os.Parcelable {
20301+
method public boolean equals(java.lang.Object);
20302+
method public int hashCode();
20303+
method public void writeToParcel(android.os.Parcel, int);
20304+
field public static final android.os.Parcelable.Creator CREATOR;
20305+
}
20306+
20307+
public class CellSignalStrengthLte extends android.telephony.CellSignalStrength implements android.os.Parcelable {
20308+
method public boolean equals(java.lang.Object);
20309+
method public int getTimingAdvance();
20310+
method public int hashCode();
20311+
method public void writeToParcel(android.os.Parcel, int);
20312+
field public static final android.os.Parcelable.Creator CREATOR;
20313+
}
20314+
2021720315
public class NeighboringCellInfo implements android.os.Parcelable {
2021820316
ctor public deprecated NeighboringCellInfo();
2021920317
ctor public deprecated NeighboringCellInfo(int, int);
@@ -20286,6 +20384,7 @@ package android.telephony {
2028620384
ctor public PhoneStateListener();
2028720385
method public void onCallForwardingIndicatorChanged(boolean);
2028820386
method public void onCallStateChanged(int, java.lang.String);
20387+
method public void onCellInfoChanged(java.util.List<android.telephony.CellInfo>);
2028920388
method public void onCellLocationChanged(android.telephony.CellLocation);
2029020389
method public void onDataActivity(int);
2029120390
method public void onDataConnectionStateChanged(int);
@@ -20296,6 +20395,7 @@ package android.telephony {
2029620395
method public void onSignalStrengthsChanged(android.telephony.SignalStrength);
2029720396
field public static final int LISTEN_CALL_FORWARDING_INDICATOR = 8; // 0x8
2029820397
field public static final int LISTEN_CALL_STATE = 32; // 0x20
20398+
field public static final int LISTEN_CELL_INFO = 1024; // 0x400
2029920399
field public static final int LISTEN_CELL_LOCATION = 16; // 0x10
2030020400
field public static final int LISTEN_DATA_ACTIVITY = 128; // 0x80
2030120401
field public static final int LISTEN_DATA_CONNECTION_STATE = 64; // 0x40
@@ -20421,6 +20521,7 @@ package android.telephony {
2042120521
}
2042220522

2042320523
public class TelephonyManager {
20524+
method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
2042420525
method public int getCallState();
2042520526
method public android.telephony.CellLocation getCellLocation();
2042620527
method public int getDataActivity();

‎telephony/java/android/telephony/CellIdentity.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,26 @@
2222
/**
2323
* CellIdentity is immutable and represents ONE unique cell in the world
2424
* it contains all levels of info to identity country, carrier, etc.
25-
*
26-
* @hide
2725
*/
2826
public abstract class CellIdentity implements Parcelable {
2927

3028
// Type fields for parceling
29+
/** @hide */
3130
protected static final int TYPE_GSM = 1;
31+
/** @hide */
3232
protected static final int TYPE_CDMA = 2;
33+
/** @hide */
3334
protected static final int TYPE_LTE = 3;
3435

36+
/** @hide */
3537
protected CellIdentity() {
3638
}
3739

40+
/** @hide */
3841
protected CellIdentity(Parcel in) {
3942
}
4043

44+
/** @hide */
4145
protected CellIdentity(CellIdentity cid) {
4246
}
4347

‎telephony/java/android/telephony/CellIdentityCdma.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222

2323
/**
2424
* CellIdentity is to represent a unique CDMA cell
25-
*
26-
* @hide
2725
*/
2826
public final class CellIdentityCdma extends CellIdentity implements Parcelable {
2927

‎telephony/java/android/telephony/CellIdentityGsm.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222

2323
/**
2424
* CellIdentity to represent a unique GSM or UMTS cell
25-
*
26-
* @hide
2725
*/
2826
public final class CellIdentityGsm extends CellIdentity implements Parcelable {
2927

‎telephony/java/android/telephony/CellIdentityLte.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222

2323
/**
2424
* CellIdentity is to represent a unique LTE cell
25-
*
26-
* @hide
2725
*/
2826
public final class CellIdentityLte extends CellIdentity implements Parcelable {
2927

‎telephony/java/android/telephony/CellInfo.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@
2121

2222
/**
2323
* Immutable cell information from a point in time.
24-
*
25-
* @hide
2624
*/
2725
public class CellInfo implements Parcelable {
2826

2927
// Type fields for parceling
28+
/** @hide */
3029
protected static final int TYPE_GSM = 1;
30+
/** @hide */
3131
protected static final int TYPE_CDMA = 2;
32+
/** @hide */
3233
protected static final int TYPE_LTE = 3;
3334

3435
// Type to distinguish where time stamp gets recorded.
@@ -54,12 +55,14 @@ public class CellInfo implements Parcelable {
5455
// Value of TIMESTAMP_TYPE_XXXX
5556
private int mTimeStampType;
5657

58+
/** @hide */
5759
protected CellInfo() {
5860
this.mRegistered = false;
5961
this.mTimeStampType = TIMESTAMP_TYPE_UNKNOWN;
6062
this.mTimeStamp = Long.MAX_VALUE;
6163
}
6264

65+
/** @hide */
6366
protected CellInfo(CellInfo ci) {
6467
this.mRegistered = ci.mRegistered;
6568
this.mTimeStampType = ci.mTimeStampType;
@@ -168,6 +171,7 @@ public void writeToParcel(Parcel dest, int flags) {
168171
dest.writeLong(mTimeStamp);
169172
}
170173

174+
/** @hide */
171175
protected CellInfo(Parcel in) {
172176
mRegistered = (in.readInt() == 1) ? true : false;
173177
mTimeStampType = in.readInt();

‎telephony/java/android/telephony/CellInfoCdma.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222

2323
/**
2424
* Immutable cell information from a point in time.
25-
*
26-
* @hide
2725
*/
2826
public final class CellInfoCdma extends CellInfo implements Parcelable {
2927

‎telephony/java/android/telephony/CellInfoGsm.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222

2323
/**
2424
* Immutable cell information from a point in time.
25-
*
26-
* @hide
2725
*/
2826
public final class CellInfoGsm extends CellInfo implements Parcelable {
2927

‎telephony/java/android/telephony/CellInfoLte.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222

2323
/**
2424
* Immutable cell information from a point in time.
25-
*
26-
* @hide
2725
*/
2826
public final class CellInfoLte extends CellInfo implements Parcelable {
2927

‎telephony/java/android/telephony/CellSignalStrength.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818

1919
import android.os.Parcel;
2020
import android.os.Parcelable;
21-
import android.view.InputEvent;
2221

2322
/**
2423
* Abstract base class for cell phone signal strength related information.
25-
*
26-
* @hide
2724
*/
2825
public abstract class CellSignalStrength implements Parcelable {
2926

3027
// Type fields for parceling
28+
/** @hide */
3129
protected static final int TYPE_GSM = 1;
30+
/** @hide */
3231
protected static final int TYPE_CDMA = 2;
32+
/** @hide */
3333
protected static final int TYPE_LTE = 3;
3434

3535

@@ -50,6 +50,10 @@ public abstract class CellSignalStrength implements Parcelable {
5050
"none", "poor", "moderate", "good", "great"
5151
};
5252

53+
/** @hide */
54+
protected CellSignalStrength() {
55+
}
56+
5357
/** @hide */
5458
public abstract void setDefaultValues();
5559

0 commit comments

Comments
 (0)