From b1ce532c3d5b61c5f392f34400301dc06f3118cc Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Wed, 19 May 2021 14:55:41 -0700
Subject: [PATCH 1/3] [LSC] Add LOCAL_LICENSE_KINDS to device/google/raviole

Added SPDX-license-identifier-Apache-2.0 to:
  self-extractors_oriole/google_devices/staging/Android.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: If3a7caf60368f498c08b7950353aa86ae75bc2f9
---
 .../google_devices/staging/Android.mk             | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/self-extractors_oriole/google_devices/staging/Android.mk b/self-extractors_oriole/google_devices/staging/Android.mk
index b11c2e4..8beb558 100644
--- a/self-extractors_oriole/google_devices/staging/Android.mk
+++ b/self-extractors_oriole/google_devices/staging/Android.mk
@@ -33,6 +33,9 @@ LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_CERTIFICATE := platform
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -45,6 +48,9 @@ LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_CERTIFICATE := platform
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -58,6 +64,9 @@ LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_CERTIFICATE := platform
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -70,6 +79,9 @@ LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_CERTIFICATE := platform
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -83,6 +95,9 @@ LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_CERTIFICATE := platform
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
 include $(BUILD_PREBUILT)
 
 endif

From d9ff8cb3c515d1ce2b11b83a2faf59a9b81fd724 Mon Sep 17 00:00:00 2001
From: Gil <gilliu@google.com>
Date: Thu, 13 May 2021 14:55:15 +0800
Subject: [PATCH 2/3] [Display] Modify the AOD Brightness

Set night/low as 2 nits, sun/high as 50 nits

Bug: 184728677
Test: Boot test and check AOD brightness
Change-Id: I0e6f5fda297f3e57f21a1d45e2f70b0dcccf04d1
---
 .../frameworks/base/packages/SystemUI/res/values/config.xml   | 4 ++--
 .../frameworks/base/packages/SystemUI/res/values/config.xml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 546c3de..803765f 100644
--- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -37,8 +37,8 @@
         <item>-1</item> <!-- 0: OFF -->
         <item>5</item> <!-- 1: NIGHT -->
         <item>5</item> <!-- 2: LOW -->
-        <item>27</item> <!-- 3: HIGH -->
-        <item>27</item> <!-- 4: SUN -->
+        <item>200</item> <!-- 3: HIGH -->
+        <item>200</item> <!-- 4: SUN -->
     </integer-array>
 
     <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 5aabc86..b848b8c 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -37,8 +37,8 @@
         <item>-1</item> <!-- 0: OFF -->
         <item>5</item> <!-- 1: NIGHT -->
         <item>5</item> <!-- 2: LOW -->
-        <item>27</item> <!-- 3: HIGH -->
-        <item>27</item> <!-- 4: SUN -->
+        <item>200</item> <!-- 3: HIGH -->
+        <item>200</item> <!-- 4: SUN -->
     </integer-array>
 
     <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor

From af48a489075560432fa36877e338b86abf4b3455 Mon Sep 17 00:00:00 2001
From: George Chang <georgekgchang@google.com>
Date: Tue, 25 May 2021 17:24:50 +0800
Subject: [PATCH 3/3] Update NFC Settings

Enable HCE Type B support

Bug: 189189874
Test: manual
Change-Id: I031b1da0f95ba442cd54796cfc91f3e43ac39998
---
 nfc/libnfc-nci-raven.conf | 7 +++++++
 nfc/libnfc-nci.conf       | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/nfc/libnfc-nci-raven.conf b/nfc/libnfc-nci-raven.conf
index 789c5eb..3940b1f 100644
--- a/nfc/libnfc-nci-raven.conf
+++ b/nfc/libnfc-nci-raven.conf
@@ -12,6 +12,13 @@ NFA_STORAGE="/data/nfc"
 # Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F
 UICC_LISTEN_TECH_MASK=0x07
 
+###############################################################################
+# Set HOST default listen to the following technology(s).
+# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
+# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F
+# 0x07 = A + B + F
+HOST_LISTEN_TECH_MASK=0x07
+
 ###############################################################################
 # AID for Empty Select command
 # If specified, this AID will be substituted when an Empty SELECT command is
diff --git a/nfc/libnfc-nci.conf b/nfc/libnfc-nci.conf
index c475161..c17296a 100644
--- a/nfc/libnfc-nci.conf
+++ b/nfc/libnfc-nci.conf
@@ -12,6 +12,13 @@ NFA_STORAGE="/data/nfc"
 # Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F
 UICC_LISTEN_TECH_MASK=0x07
 
+###############################################################################
+# Set HOST default listen to the following technology(s).
+# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
+# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F
+# 0x07 = A + B + F
+HOST_LISTEN_TECH_MASK=0x07
+
 ###############################################################################
 # AID for Empty Select command
 # If specified, this AID will be substituted when an Empty SELECT command is