summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/display/DisplayManagerService.java
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-09-07 16:00:12 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-07 16:00:13 -0700
commit7017e48380ab0c1be033594bb2a9331898ad5be8 (patch)
tree1e24e747937706deb96ac1770f71a9c4cb6ebc65 /services/java/com/android/server/display/DisplayManagerService.java
parentcd620591b764cd999f18878985444fba01d5b710 (diff)
parentcbad976b2a36a0895ca94510d5208a86f66cf596 (diff)
downloadframeworks_base-7017e48380ab0c1be033594bb2a9331898ad5be8.zip
frameworks_base-7017e48380ab0c1be033594bb2a9331898ad5be8.tar.gz
frameworks_base-7017e48380ab0c1be033594bb2a9331898ad5be8.tar.bz2
Merge "Add support for Wifi display." into jb-mr1-dev
Diffstat (limited to 'services/java/com/android/server/display/DisplayManagerService.java')
-rw-r--r--services/java/com/android/server/display/DisplayManagerService.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/display/DisplayManagerService.java b/services/java/com/android/server/display/DisplayManagerService.java
index 706007a..ae958df 100644
--- a/services/java/com/android/server/display/DisplayManagerService.java
+++ b/services/java/com/android/server/display/DisplayManagerService.java
@@ -333,6 +333,8 @@ public final class DisplayManagerService extends IDisplayManager.Stub {
if (shouldRegisterNonEssentialDisplayAdaptersLocked()) {
registerDisplayAdapterLocked(new OverlayDisplayAdapter(
mSyncRoot, mContext, mHandler, mDisplayAdapterListener, mUiHandler));
+ registerDisplayAdapterLocked(new WifiDisplayAdapter(
+ mSyncRoot, mContext, mHandler, mDisplayAdapterListener));
}
}
}