diff options
| author | jsh <jsh@google.com> | 2010-09-14 15:05:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-14 15:05:53 -0700 |
| commit | b30f21882080bd4c0d7c3b25878151dd19ac3f94 (patch) | |
| tree | 90e45782c82f0460630a90c00b16b9617353f095 /telephony/java/android | |
| parent | 23b8054e85eaffa515c597e7b386e3892968302d (diff) | |
| parent | 17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4 (diff) | |
| download | frameworks_base-b30f21882080bd4c0d7c3b25878151dd19ac3f94.zip frameworks_base-b30f21882080bd4c0d7c3b25878151dd19ac3f94.tar.gz frameworks_base-b30f21882080bd4c0d7c3b25878151dd19ac3f94.tar.bz2 | |
am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread
Merge commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4' into gingerbread-plus-aosp
* commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4':
Unhide GsmCellLocation.getPsc().
Diffstat (limited to 'telephony/java/android')
| -rw-r--r-- | telephony/java/android/telephony/gsm/GsmCellLocation.java | 4 |
1 files changed, 3 insertions, 1 deletions
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; |