commit 0d2f2fb0be4261f00e45c8ebb7999ddea8d1f9e3
author Robert Greenwalt <rgreenwalt@google.com> Mon Jan 05 23:42:50 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 05 23:42:50 2015 +0000
tree bf512d78b2844b9a74fbdc453c7bfbf9f7f09919
parent 02cab444fbcedcee50b8563d80f87cd6b125d85d
parent 0994d12b0d37f81b4b5b619b82db6bc20b3b6384

am 0994d12b: am d38218d8: am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class members properly"

* commit '0994d12b0d37f81b4b5b619b82db6bc20b3b6384':
  Telephony: Initialize GsmCellLocation class members properly

telephony/java/android/telephony/gsm/GsmCellLocation.java

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 @@
      * 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);
     }
 
     /**