am 4fb5b85a: am dce8b948: Merge "Fix parceling of display info flags." into jb-mr1-dev

* commit '4fb5b85a5be88028398e67f37b2d7f802550d9fd': Fix parceling of display info flags.
2012-10-04 15:31:07 -07:00
parent 5e1b345f41 4fb5b85a5b
commit 6ac19fe0b0
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/DisplayInfo.java
+++ b/core/java/android/view/DisplayInfo.java
@@ -233,7 +233,7 @@ public final class DisplayInfo implements Parcelable {
    @Override
    public void writeToParcel(Parcel dest, int flags) {
        dest.writeInt(layerStack);
-        dest.writeInt(flags);
+        dest.writeInt(this.flags);
        dest.writeString(name);
        dest.writeInt(appWidth);
        dest.writeInt(appHeight);