Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow OEMs to restrict access to secondary display" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-05 21:17:52 +00:00
committed by Android (Google) Code Review
parent 822ce4f3aa a6fec7be6c
commit 7ba60d25f3
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/config.xml
View File

@@ -2249,6 +2249,10 @@
mirror the content of the default display. --> mirror the content of the default display. -->
<bool name="config_localDisplaysMirrorContent">true</bool> <bool name="config_localDisplaysMirrorContent">true</bool>
<!-- Indicates whether local non-default displays are private.
{@see android.view.Display#FLAG_PRIVATE} -->
<bool name="config_localDisplaysPrivate">false</bool>
<!-- The default mode for the default display. One of the following values (See Display.java): <!-- The default mode for the default display. One of the following values (See Display.java):
0 - COLOR_MODE_DEFAULT 0 - COLOR_MODE_DEFAULT
7 - COLOR_MODE_SRGB 7 - COLOR_MODE_SRGB

1
core/res/res/values/symbols.xml
View File

@@ -352,6 +352,7 @@
<java-symbol type="bool" name="config_noHomeScreen" /> <java-symbol type="bool" name="config_noHomeScreen" />
<java-symbol type="bool" name="config_guestUserEphemeral" /> <java-symbol type="bool" name="config_guestUserEphemeral" />
<java-symbol type="bool" name="config_localDisplaysMirrorContent" /> <java-symbol type="bool" name="config_localDisplaysMirrorContent" />
<java-symbol type="bool" name="config_localDisplaysPrivate" />
<java-symbol type="integer" name="config_defaultDisplayDefaultColorMode" /> <java-symbol type="integer" name="config_defaultDisplayDefaultColorMode" />
<java-symbol type="bool" name="config_enableAppWidgetService" /> <java-symbol type="bool" name="config_enableAppWidgetService" />
<java-symbol type="string" name="config_defaultPictureInPictureScreenEdgeInsets" /> <java-symbol type="string" name="config_defaultPictureInPictureScreenEdgeInsets" />

4
services/core/java/com/android/server/display/LocalDisplayAdapter.java
View File

@@ -436,6 +436,10 @@ final class LocalDisplayAdapter extends DisplayAdapter {
com.android.internal.R.bool.config_localDisplaysMirrorContent)) { com.android.internal.R.bool.config_localDisplaysMirrorContent)) {
mInfo.flags |= DisplayDeviceInfo.FLAG_OWN_CONTENT_ONLY; mInfo.flags |= DisplayDeviceInfo.FLAG_OWN_CONTENT_ONLY;
} }
if (res.getBoolean(com.android.internal.R.bool.config_localDisplaysPrivate)) {
mInfo.flags |= DisplayDeviceInfo.FLAG_PRIVATE;
}
} }
} }
return mInfo; return mInfo;