summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-10-04 15:04:20 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-04 15:04:21 -0700
commitdce8b948320e933e46e4a38c496f56555472495f (patch)
tree693e33bc999a38f53a93e8c1b1a44b6b6e4d2ca2
parentb4fad85ca0ed258e4f8de8045c707a4bf2a6ce66 (diff)
parent3f2ba6220bf74cb5157d6fafee9c76f526acea68 (diff)
downloadframeworks_base-dce8b948320e933e46e4a38c496f56555472495f.zip
frameworks_base-dce8b948320e933e46e4a38c496f56555472495f.tar.gz
frameworks_base-dce8b948320e933e46e4a38c496f56555472495f.tar.bz2
Merge "Fix parceling of display info flags." into jb-mr1-dev
-rw-r--r--core/java/android/view/DisplayInfo.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java
index fe05634..fb04150 100644
--- 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);