summaryrefslogtreecommitdiffstats
path: root/core/java/android/view
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2012-10-22 15:30:42 -0700
committerJamie Gennis <jgennis@google.com>2012-10-23 15:07:22 -0700
commit95429c3d1b8113c23b0aad3b74d724dccfad7fa9 (patch)
treea19df31393246ef80b5629033112aa6820ac4f61 /core/java/android/view
parent5be59670c26edf27bfdfdf0430b535dda718bd9d (diff)
downloadframeworks_base-95429c3d1b8113c23b0aad3b74d724dccfad7fa9.zip
frameworks_base-95429c3d1b8113c23b0aad3b74d724dccfad7fa9.tar.gz
frameworks_base-95429c3d1b8113c23b0aad3b74d724dccfad7fa9.tar.bz2
Surface: add the PhysicalDisplayInfo#secure field
Bug: 7368436 Change-Id: I38bf7bbfca354380c30da7516f628cf40416d350
Diffstat (limited to 'core/java/android/view')
-rw-r--r--core/java/android/view/Surface.java8
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
+ + "}";
}
}