summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server
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 /services/java/com/android/server
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 'services/java/com/android/server')
-rw-r--r--services/java/com/android/server/display/OverlayDisplayAdapter.java2
-rw-r--r--services/java/com/android/server/display/WifiDisplayAdapter.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/display/OverlayDisplayAdapter.java b/services/java/com/android/server/display/OverlayDisplayAdapter.java
index 937ebcf..c35fd98 100644
--- a/services/java/com/android/server/display/OverlayDisplayAdapter.java
+++ b/services/java/com/android/server/display/OverlayDisplayAdapter.java
@@ -282,7 +282,7 @@ final class OverlayDisplayAdapter extends DisplayAdapter {
@Override
public void onWindowCreated(SurfaceTexture surfaceTexture, float refreshRate) {
synchronized (getSyncRoot()) {
- IBinder displayToken = Surface.createDisplay(mName);
+ IBinder displayToken = Surface.createDisplay(mName, false);
mDevice = new OverlayDisplayDevice(displayToken, mName,
mWidth, mHeight, refreshRate, mDensityDpi, surfaceTexture);
diff --git a/services/java/com/android/server/display/WifiDisplayAdapter.java b/services/java/com/android/server/display/WifiDisplayAdapter.java
index f9d58af..97fc3e6 100644
--- a/services/java/com/android/server/display/WifiDisplayAdapter.java
+++ b/services/java/com/android/server/display/WifiDisplayAdapter.java
@@ -292,7 +292,7 @@ final class WifiDisplayAdapter extends DisplayAdapter {
float refreshRate = 60.0f; // TODO: get this for real
String name = display.getFriendlyDisplayName();
- IBinder displayToken = Surface.createDisplay(name);
+ IBinder displayToken = Surface.createDisplay(name, false);
mDisplayDevice = new WifiDisplayDevice(displayToken, name, width, height,
refreshRate, deviceFlags, surface);
sendDisplayDeviceEventLocked(mDisplayDevice, DISPLAY_DEVICE_EVENT_ADDED);