From a6fec7be6cde3e7401ef8ebb7ec0040ccd6253f7 Mon Sep 17 00:00:00 2001
From: Pavel Maltsev <pavelm@google.com>
Date: Wed, 4 Apr 2018 10:14:55 -0700
Subject: [PATCH] Allow OEMs to restrict access to secondary display

This is crucial for automotive use-cases when OEMs want to restrict
access to instrument cluster display by third-party apps

Bug: 28864915
Bug: 70840956
Test: manually verify that secondary display with private flag is not
accessible by third-party apps and accessible to apps with system uid

Change-Id: I39e36c2ea73d879a4c7b01220ae852298d868fd5
---
 core/res/res/values/config.xml                                | 4 ++++
 core/res/res/values/symbols.xml                               | 1 +
 .../java/com/android/server/display/LocalDisplayAdapter.java  | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 3cd80f2677e09..12e5dfef9e358 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -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
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 78a7286bf7128..6229da3b4251c 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -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" />
diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
index 5ca9abc8355d0..b9a279ad13ea0 100644
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -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;