summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2015-01-05 23:39:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-05 23:39:01 +0000
commit0994d12b0d37f81b4b5b619b82db6bc20b3b6384 (patch)
treeb87e71607d724d5eece1f50290624f00f6e76d35 /telephony
parentf4d3973c319502fc8aa3e1aa1d7e7502274ea3aa (diff)
parentd38218d880f02951015733a3d3e00deb546465bf (diff)
downloadframeworks_base-0994d12b0d37f81b4b5b619b82db6bc20b3b6384.zip
frameworks_base-0994d12b0d37f81b4b5b619b82db6bc20b3b6384.tar.gz
frameworks_base-0994d12b0d37f81b4b5b619b82db6bc20b3b6384.tar.bz2
am d38218d8: am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class members properly"
* commit 'd38218d880f02951015733a3d3e00deb546465bf': Telephony: Initialize GsmCellLocation class members properly
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/android/telephony/gsm/GsmCellLocation.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/gsm/GsmCellLocation.java b/telephony/java/android/telephony/gsm/GsmCellLocation.java
index 313bc82..a3889b2 100644
--- a/telephony/java/android/telephony/gsm/GsmCellLocation.java
+++ b/telephony/java/android/telephony/gsm/GsmCellLocation.java
@@ -40,9 +40,9 @@ public class GsmCellLocation extends CellLocation {
* Initialize the object from a bundle.
*/
public GsmCellLocation(Bundle bundle) {
- mLac = bundle.getInt("lac", mLac);
- mCid = bundle.getInt("cid", mCid);
- mPsc = bundle.getInt("psc", mPsc);
+ mLac = bundle.getInt("lac", -1);
+ mCid = bundle.getInt("cid", -1);
+ mPsc = bundle.getInt("psc", -1);
}
/**