diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-09-07 16:00:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-07 16:00:13 -0700 |
| commit | 7017e48380ab0c1be033594bb2a9331898ad5be8 (patch) | |
| tree | 1e24e747937706deb96ac1770f71a9c4cb6ebc65 /services/java/com/android/server/display/LocalDisplayAdapter.java | |
| parent | cd620591b764cd999f18878985444fba01d5b710 (diff) | |
| parent | cbad976b2a36a0895ca94510d5208a86f66cf596 (diff) | |
| download | frameworks_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/LocalDisplayAdapter.java')
| -rw-r--r-- | services/java/com/android/server/display/LocalDisplayAdapter.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/java/com/android/server/display/LocalDisplayAdapter.java b/services/java/com/android/server/display/LocalDisplayAdapter.java index 4a8829a..4962753 100644 --- a/services/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/java/com/android/server/display/LocalDisplayAdapter.java @@ -120,19 +120,20 @@ final class LocalDisplayAdapter extends DisplayAdapter { mInfo.width = mPhys.width; mInfo.height = mPhys.height; mInfo.refreshRate = mPhys.refreshRate; - mInfo.densityDpi = (int)(mPhys.density * 160 + 0.5f); - mInfo.xDpi = mPhys.xDpi; - mInfo.yDpi = mPhys.yDpi; if (mBuiltInDisplayId == Surface.BUILT_IN_DISPLAY_ID_MAIN) { mInfo.name = getContext().getResources().getString( com.android.internal.R.string.display_manager_built_in_display_name); mInfo.flags = DisplayDeviceInfo.FLAG_DEFAULT_DISPLAY | DisplayDeviceInfo.FLAG_SECURE | DisplayDeviceInfo.FLAG_SUPPORTS_ROTATION; + mInfo.densityDpi = (int)(mPhys.density * 160 + 0.5f); + mInfo.xDpi = mPhys.xDpi; + mInfo.yDpi = mPhys.yDpi; } else { mInfo.name = getContext().getResources().getString( com.android.internal.R.string.display_manager_hdmi_display_name); mInfo.flags = DisplayDeviceInfo.FLAG_SECURE; + mInfo.setAssumedDensityForExternalDisplay(mPhys.width, mPhys.height); } } return mInfo; |