Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b6f0cbdc: merge from open-source master

Browse Source 
Merge commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1' into kraken

* commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1':
  Include the API level 4 fields in the Parcel.
This commit is contained in:
The Android Open Source Project
2010-05-10 13:50:32 -07:00
committed by Android Git Automerger
parent 38a410f12a b6f0cbdcbb
commit e88ae544e3
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
location/java/android/location/Address.java
View File

@@ -500,7 +500,10 @@ public class Address implements Parcelable {
a.mAdminArea = in.readString(); a.mAdminArea = in.readString();
a.mSubAdminArea = in.readString(); a.mSubAdminArea = in.readString();
a.mLocality = in.readString(); a.mLocality = in.readString();
a.mSubLocality = in.readString();
a.mThoroughfare = in.readString(); a.mThoroughfare = in.readString();
a.mSubThoroughfare = in.readString();
a.mPremises = in.readString();
a.mPostalCode = in.readString(); a.mPostalCode = in.readString();
a.mCountryCode = in.readString(); a.mCountryCode = in.readString();
a.mCountryName = in.readString(); a.mCountryName = in.readString();
@@ -544,7 +547,10 @@ public class Address implements Parcelable {
parcel.writeString(mAdminArea); parcel.writeString(mAdminArea);
parcel.writeString(mSubAdminArea); parcel.writeString(mSubAdminArea);
parcel.writeString(mLocality); parcel.writeString(mLocality);
parcel.writeString(mSubLocality);
parcel.writeString(mThoroughfare); parcel.writeString(mThoroughfare);
parcel.writeString(mSubThoroughfare);
parcel.writeString(mPremises);
parcel.writeString(mPostalCode); parcel.writeString(mPostalCode);
parcel.writeString(mCountryCode); parcel.writeString(mCountryCode);
parcel.writeString(mCountryName); parcel.writeString(mCountryName);