summaryrefslogtreecommitdiffstats
path: root/core/java/android/view
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2012-10-22 13:49:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-22 13:49:35 -0700
commit23d622418b5c67dc43faabd930d1c59c5ce34f6a (patch)
tree88309f812ec742f30516365ff2ef175e0b54e246 /core/java/android/view
parentd07f8d0b373fa4581c6b11738931c8f9fbd79ac7 (diff)
parent7bbf8163fb83afc54b353a8def52bfb87ecce047 (diff)
downloadframeworks_base-23d622418b5c67dc43faabd930d1c59c5ce34f6a.zip
frameworks_base-23d622418b5c67dc43faabd930d1c59c5ce34f6a.tar.gz
frameworks_base-23d622418b5c67dc43faabd930d1c59c5ce34f6a.tar.bz2
Merge "Set the secureness when creating displays" into jb-mr1-dev
Diffstat (limited to 'core/java/android/view')
-rw-r--r--core/java/android/view/Surface.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java
index 7ef6939..183b012 100644
--- a/core/java/android/view/Surface.java
+++ b/core/java/android/view/Surface.java
@@ -258,7 +258,7 @@ public class Surface implements Parcelable {
private native void nativeSetLayerStack(int layerStack);
private static native IBinder nativeGetBuiltInDisplay(int physicalDisplayId);
- private static native IBinder nativeCreateDisplay(String name);
+ private static native IBinder nativeCreateDisplay(String name, boolean secure);
private static native void nativeSetDisplaySurface(
IBinder displayToken, Surface surface);
private static native void nativeSetDisplayLayerStack(
@@ -597,11 +597,11 @@ public class Surface implements Parcelable {
}
/** @hide */
- public static IBinder createDisplay(String name) {
+ public static IBinder createDisplay(String name, boolean secure) {
if (name == null) {
throw new IllegalArgumentException("name must not be null");
}
- return nativeCreateDisplay(name);
+ return nativeCreateDisplay(name, secure);
}
/** @hide */