diff options
| author | jsh <jsh@google.com> | 2010-09-15 12:19:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 12:19:05 -0700 |
| commit | 19c5df745229374748f38c76a222ec8ce1d08e81 (patch) | |
| tree | 439fd27bcfc598c140d9b082b3d944684ae3ddc8 | |
| parent | 30ef985b702e97e8b1b04fab119d0085a2ada71f (diff) | |
| parent | b30f21882080bd4c0d7c3b25878151dd19ac3f94 (diff) | |
| download | frameworks_base-19c5df745229374748f38c76a222ec8ce1d08e81.zip frameworks_base-19c5df745229374748f38c76a222ec8ce1d08e81.tar.gz frameworks_base-19c5df745229374748f38c76a222ec8ce1d08e81.tar.bz2 | |
am b30f2188: am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread
Merge commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94'
* commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94':
Unhide GsmCellLocation.getPsc().
| -rw-r--r-- | api/current.xml | 11 | ||||
| -rw-r--r-- | telephony/java/android/telephony/gsm/GsmCellLocation.java | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml index f0a9810..882c157 100644 --- a/api/current.xml +++ b/api/current.xml @@ -163589,6 +163589,17 @@ visibility="public" > </method> +<method name="getPsc" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="setLacAndCid" return="void" abstract="false" diff --git a/telephony/java/android/telephony/gsm/GsmCellLocation.java b/telephony/java/android/telephony/gsm/GsmCellLocation.java index c4204fa..313bc82 100644 --- a/telephony/java/android/telephony/gsm/GsmCellLocation.java +++ b/telephony/java/android/telephony/gsm/GsmCellLocation.java @@ -60,8 +60,10 @@ public class GsmCellLocation extends CellLocation { } /** + * On a UMTS network, returns the primary scrambling code of the serving + * cell. + * * @return primary scrambling code for UMTS, -1 if unknown or GSM - * @hide */ public int getPsc() { return mPsc; |