summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-10-23 17:35:57 -0700
committerJeff Brown <jeffbrown@google.com>2012-10-23 20:37:40 -0700
commitf0681b34dffc1510cbd9c3da5c3a7e695553fa8d (patch)
tree750cc9603cd0571c9a229117129b6c21ab61be24 /api
parent56e75631bd737e5362309330d4839cc1dddb501c (diff)
downloadframeworks_base-f0681b34dffc1510cbd9c3da5c3a7e695553fa8d.zip
frameworks_base-f0681b34dffc1510cbd9c3da5c3a7e695553fa8d.tar.gz
frameworks_base-f0681b34dffc1510cbd9c3da5c3a7e695553fa8d.tar.bz2
Secure windows, secure surface views and secure displays.
Add new API to determine whether a display is secure. Add new API to make a SurfaceView secure. Clarify documentation. Bug: 7368436 Change-Id: I7068c34c910e43b4bc72e43fa0dded59a25f0fe2
Diffstat (limited to 'api')
-rw-r--r--api/17.txt2
-rw-r--r--api/current.txt2
2 files changed, 4 insertions, 0 deletions
diff --git a/api/17.txt b/api/17.txt
index 31ed755..e7f02dc 100644
--- a/api/17.txt
+++ b/api/17.txt
@@ -23742,6 +23742,7 @@ package android.view {
method public deprecated int getWidth();
method public boolean isValid();
field public static final int DEFAULT_DISPLAY = 0; // 0x0
+ field public static final int FLAG_SECURE = 2; // 0x2
field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1
}
@@ -24788,6 +24789,7 @@ package android.view {
ctor public SurfaceView(android.content.Context, android.util.AttributeSet, int);
method public boolean gatherTransparentRegion(android.graphics.Region);
method public android.view.SurfaceHolder getHolder();
+ method public void setSecure(boolean);
method public void setZOrderMediaOverlay(boolean);
method public void setZOrderOnTop(boolean);
}
diff --git a/api/current.txt b/api/current.txt
index 31ed755..e7f02dc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -23742,6 +23742,7 @@ package android.view {
method public deprecated int getWidth();
method public boolean isValid();
field public static final int DEFAULT_DISPLAY = 0; // 0x0
+ field public static final int FLAG_SECURE = 2; // 0x2
field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1
}
@@ -24788,6 +24789,7 @@ package android.view {
ctor public SurfaceView(android.content.Context, android.util.AttributeSet, int);
method public boolean gatherTransparentRegion(android.graphics.Region);
method public android.view.SurfaceHolder getHolder();
+ method public void setSecure(boolean);
method public void setZOrderMediaOverlay(boolean);
method public void setZOrderOnTop(boolean);
}