diff options
| author | Jamie Gennis <jgennis@google.com> | 2012-10-23 15:22:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-23 15:22:37 -0700 |
| commit | cd79b35c3828e0ebf4c9e68da75f9d857ccf01db (patch) | |
| tree | dd61c988eaa7691b8753be7ec1eeb90b5fe768bf /core/java/android/view | |
| parent | d401a53c6472921ce7785059195a4f031feea7cc (diff) | |
| parent | 95429c3d1b8113c23b0aad3b74d724dccfad7fa9 (diff) | |
| download | frameworks_base-cd79b35c3828e0ebf4c9e68da75f9d857ccf01db.zip frameworks_base-cd79b35c3828e0ebf4c9e68da75f9d857ccf01db.tar.gz frameworks_base-cd79b35c3828e0ebf4c9e68da75f9d857ccf01db.tar.bz2 | |
Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/Surface.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index 183b012..550a740 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -758,6 +758,7 @@ public class Surface implements Parcelable { public float density; public float xDpi; public float yDpi; + public boolean secure; public PhysicalDisplayInfo() { } @@ -778,7 +779,8 @@ public class Surface implements Parcelable { && refreshRate == other.refreshRate && density == other.density && xDpi == other.xDpi - && yDpi == other.yDpi; + && yDpi == other.yDpi + && secure == other.secure; } @Override @@ -793,13 +795,15 @@ public class Surface implements Parcelable { density = other.density; xDpi = other.xDpi; yDpi = other.yDpi; + secure = other.secure; } // For debugging purposes @Override public String toString() { return "PhysicalDisplayInfo{" + width + " x " + height + ", " + refreshRate + " fps, " - + "density " + density + ", " + xDpi + " x " + yDpi + " dpi}"; + + "density " + density + ", " + xDpi + " x " + yDpi + " dpi, secure " + secure + + "}"; } } |