commit b6f0cbdcbb566368ebe0468f61de024f644db6e1
author The Android Open Source Project <initial-contribution@android.com> Mon May 10 13:48:37 2010 -0700
committer The Android Open Source Project <initial-contribution@android.com> Mon May 10 13:48:37 2010 -0700
tree 11652711271f299feede2c21640985b7ba7b4424
parent 686d9ff53c32ded9b2b02eb9f2040f2030846e51
parent 855a9e6d12e4d42efe336535f9fdf5fc2e14c5d5

merge from open-source master

Change-Id: Ia4cbea9d94b2ff34fc8ce97c1fe35ca5898d6c1c

location/java/android/location/Address.java

diff --git a/location/java/android/location/Address.java b/location/java/android/location/Address.java
index ac275c6..b152f48 100644
--- a/location/java/android/location/Address.java
+++ b/location/java/android/location/Address.java
@@ -500,7 +500,10 @@
             a.mAdminArea = in.readString();
             a.mSubAdminArea = in.readString();
             a.mLocality = in.readString();
+            a.mSubLocality = in.readString();
             a.mThoroughfare = in.readString();
+            a.mSubThoroughfare = in.readString();
+            a.mPremises = in.readString();
             a.mPostalCode = in.readString();
             a.mCountryCode = in.readString();
             a.mCountryName = in.readString();
@@ -544,7 +547,10 @@
         parcel.writeString(mAdminArea);
         parcel.writeString(mSubAdminArea);
         parcel.writeString(mLocality);
+        parcel.writeString(mSubLocality);
         parcel.writeString(mThoroughfare);
+        parcel.writeString(mSubThoroughfare);
+        parcel.writeString(mPremises);
         parcel.writeString(mPostalCode);
         parcel.writeString(mCountryCode);
         parcel.writeString(mCountryName);