summaryrefslogtreecommitdiffstats
path: root/location
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-05-10 11:14:01 -0700
committerAndroid Code Review <code-review@android.com>2010-05-10 11:14:01 -0700
commit855a9e6d12e4d42efe336535f9fdf5fc2e14c5d5 (patch)
treef50e4f30ebb435948b96fa8803bd1f1cf80c8a6f /location
parent0a26aaad8b98c3b80be9562503100e925d078749 (diff)
parente6ec57727e2da14a9027293858d97a84b08768b1 (diff)
downloadframeworks_base-855a9e6d12e4d42efe336535f9fdf5fc2e14c5d5.zip
frameworks_base-855a9e6d12e4d42efe336535f9fdf5fc2e14c5d5.tar.gz
frameworks_base-855a9e6d12e4d42efe336535f9fdf5fc2e14c5d5.tar.bz2
Merge "Include the API level 4 fields in the Parcel."
Diffstat (limited to 'location')
-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);