diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-10 13:50:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-10 13:50:32 -0700 |
| commit | e88ae544e3e54958dfb6e866d4444f7f7b5d2d68 (patch) | |
| tree | 5b58f2e412e6df4379d957feb36e39a36ca1867f /location/java/android | |
| parent | 38a410f12a1cbb5f49cdee6323da898b11c907e7 (diff) | |
| parent | b6f0cbdcbb566368ebe0468f61de024f644db6e1 (diff) | |
| download | frameworks_base-e88ae544e3e54958dfb6e866d4444f7f7b5d2d68.zip frameworks_base-e88ae544e3e54958dfb6e866d4444f7f7b5d2d68.tar.gz frameworks_base-e88ae544e3e54958dfb6e866d4444f7f7b5d2d68.tar.bz2 | |
am b6f0cbdc: merge from open-source master
Merge commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1' into kraken
* commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1':
Include the API level 4 fields in the Parcel.
Diffstat (limited to 'location/java/android')
| -rw-r--r-- | location/java/android/location/Address.java | 6 |
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); |