summaryrefslogtreecommitdiffstats
path: root/location/java
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-10 13:48:37 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-05-10 13:48:37 -0700
commitb6f0cbdcbb566368ebe0468f61de024f644db6e1 (patch)
tree11652711271f299feede2c21640985b7ba7b4424 /location/java
parent686d9ff53c32ded9b2b02eb9f2040f2030846e51 (diff)
parent855a9e6d12e4d42efe336535f9fdf5fc2e14c5d5 (diff)
downloadframeworks_base-b6f0cbdcbb566368ebe0468f61de024f644db6e1.zip
frameworks_base-b6f0cbdcbb566368ebe0468f61de024f644db6e1.tar.gz
frameworks_base-b6f0cbdcbb566368ebe0468f61de024f644db6e1.tar.bz2
merge from open-source master
Change-Id: Ia4cbea9d94b2ff34fc8ce97c1fe35ca5898d6c1c
Diffstat (limited to 'location/java')
-rw-r--r--location/java/android/location/Address.java6
1 files changed, 6 insertions, 0 deletions
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 @@ public class Address implements Parcelable {
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 @@ public class Address implements Parcelable {
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);