am 409024e9: Merge change 25554 into eclair

Merge commit '409024e9c0f54e91c4898dc4ed7cd402f2c3d941' into eclair-plus-aosp

* commit '409024e9c0f54e91c4898dc4ed7cd402f2c3d941':
  telephony: Add CdmaCellLocation class to the public API.
This commit is contained in:
Mike Lockwood
2009-09-17 17:15:33 -07:00
committed by Android Git Automerger
2 changed files with 150 additions and 3 deletions

View File

@@ -121613,6 +121613,153 @@
</field>
</class>
</package>
<package name="android.telephony.cdma"
>
<class name="CdmaCellLocation"
extends="android.telephony.CellLocation"
abstract="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<constructor name="CdmaCellLocation"
type="android.telephony.cdma.CdmaCellLocation"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</constructor>
<constructor name="CdmaCellLocation"
type="android.telephony.cdma.CdmaCellLocation"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="bundleWithValues" type="android.os.Bundle">
</parameter>
</constructor>
<method name="fillInNotifierBundle"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="bundleToFill" type="android.os.Bundle">
</parameter>
</method>
<method name="getBaseStationId"
return="int"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getBaseStationLatitude"
return="int"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getBaseStationLongitude"
return="int"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getNetworkId"
return="int"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSystemId"
return="int"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="setCellLocationData"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="baseStationId" type="int">
</parameter>
<parameter name="baseStationLatitude" type="int">
</parameter>
<parameter name="baseStationLongitude" type="int">
</parameter>
</method>
<method name="setCellLocationData"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="baseStationId" type="int">
</parameter>
<parameter name="baseStationLatitude" type="int">
</parameter>
<parameter name="baseStationLongitude" type="int">
</parameter>
<parameter name="systemId" type="int">
</parameter>
<parameter name="networkId" type="int">
</parameter>
</method>
<method name="setStateInvalid"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
</class>
</package>
<package name="android.telephony.gsm"
>
<class name="GsmCellLocation"

View File

@@ -20,8 +20,7 @@ import android.os.Bundle;
import android.telephony.CellLocation;
/**
* Represents the cell location on a GSM phone.
* @hide
* Represents the cell location on a CDMA phone.
*/
public class CdmaCellLocation extends CellLocation {
private int mBaseStationId = -1;
@@ -31,7 +30,8 @@ public class CdmaCellLocation extends CellLocation {
private int mNetworkId = -1;
/**
* Empty constructor. Initializes the LAC and CID to -1.
* Empty constructor.
* Initializes the BID, SID, NID and base station latitude and longitude to -1.
*/
public CdmaCellLocation() {
this.mBaseStationId = -1;