Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9984f516 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Allow OEMs to restrict access to secondary display" into pi-dev am: 7ba60d25 am: 26b46106"
parents 4ce55ba6 9e7f513e

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -2249,6 +2249,10 @@ 
         mirror the content of the default display. -->

    <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):

             0 - COLOR_MODE_DEFAULT

             7 - COLOR_MODE_SRGB

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ 
  <java-symbol type="bool" name="config_noHomeScreen" />

  <java-symbol type="bool" name="config_guestUserEphemeral" />

  <java-symbol type="bool" name="config_localDisplaysMirrorContent" />

  <java-symbol type="bool" name="config_localDisplaysPrivate" />

  <java-symbol type="integer" name="config_defaultDisplayDefaultColorMode" />

  <java-symbol type="bool" name="config_enableAppWidgetService" />

  <java-symbol type="string" name="config_defaultPictureInPictureScreenEdgeInsets" />

services/core/java/com/android/server/display/LocalDisplayAdapter.java

+4 −0
Original line number Diff line number Diff line
@@ -436,6 +436,10 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
                                com.android.internal.R.bool.config_localDisplaysMirrorContent)) {

                        mInfo.flags |= DisplayDeviceInfo.FLAG_OWN_CONTENT_ONLY;

                    }



                    if (res.getBoolean(com.android.internal.R.bool.config_localDisplaysPrivate)) {

                        mInfo.flags |= DisplayDeviceInfo.FLAG_PRIVATE;

                    }

                }

            }

            return mInfo;