From b1a045dcf381010af5ea757bddfbabc150e61cc6 Mon Sep 17 00:00:00 2001 From: George Chang Date: Thu, 26 May 2022 17:21:21 +0800 Subject: [PATCH 1/5] Remove Nfc hidl settings Nfc uses aidl now Bug: 216290344 Test: manual Merged-In: I5d1b4c47264adba2c8f517285fe603f1b4fa1188 Change-Id: I5d1b4c47264adba2c8f517285fe603f1b4fa1188 --- manifest.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/manifest.xml b/manifest.xml index 4d4f0f8..6688f36 100644 --- a/manifest.xml +++ b/manifest.xml @@ -122,15 +122,6 @@ hwbinder @1.3::IDevice/google-edgetpu - - android.hardware.nfc - hwbinder - 1.2 - - INfc - default - - android.hardware.health hwbinder From 024a5166f31b1c2d924cd9a0d275974ba7067c03 Mon Sep 17 00:00:00 2001 From: Junkyu Kang Date: Tue, 24 May 2022 23:13:30 +0800 Subject: [PATCH 2/5] Remove carrier location permission backdoor - Affected device: M23 Test: Check Carrier Location App is not installed Bug: 230813132 Change-Id: I70a7439ac3caa01aab810a80d557151b4e986023 --- gps.xml.l10 | 2 -- gps_user.xml.l10 | 2 -- 2 files changed, 4 deletions(-) diff --git a/gps.xml.l10 b/gps.xml.l10 index a6bbcfc..d8d896f 100644 --- a/gps.xml.l10 +++ b/gps.xml.l10 @@ -49,8 +49,6 @@ CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" - AttributionAppPkgName="com.google.android.carrierlocation" - AssertEnabled="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" diff --git a/gps_user.xml.l10 b/gps_user.xml.l10 index 686d7dd..caf5bd5 100644 --- a/gps_user.xml.l10 +++ b/gps_user.xml.l10 @@ -48,8 +48,6 @@ CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" - AttributionAppPkgName="com.google.android.carrierlocation" - AssertEnabled="false" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" From 9782bbc0cad74538421c6526bfbecd1969e64a20 Mon Sep 17 00:00:00 2001 From: George Chang Date: Thu, 5 May 2022 01:41:30 +0800 Subject: [PATCH 3/5] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Merged-In: Id3f65723c6240bbae6f6cc92e7ee57e07e1f0974 Change-Id: Id3f65723c6240bbae6f6cc92e7ee57e07e1f0974 --- device-lynx.mk | 3 +-- nfc/libnfc-hal-st.conf | 4 ++-- nfc/manifest_nfc.xml | 11 ----------- 3 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 nfc/manifest_nfc.xml diff --git a/device-lynx.mk b/device-lynx.mk index 2598ca6..c0d42d5 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -59,7 +59,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -73,7 +73,6 @@ PRODUCT_COPY_FILES += \ device/google/lynx/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/lynx/nfc/manifest_nfc.xml \ device/google/lynx/nfc/manifest_se.xml # Thermal Config diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index 60e84ac..1a134f4 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# ALLOW list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/manifest_nfc.xml b/nfc/manifest_nfc.xml deleted file mode 100644 index 86caacb..0000000 --- a/nfc/manifest_nfc.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - android.hardware.nfc - hwbinder - 1.2 - - INfc - default - - - From d4aff776ac592fcc1d729afa7e8ed7748eb13d5a Mon Sep 17 00:00:00 2001 From: Gil Date: Mon, 30 May 2022 15:08:41 +0800 Subject: [PATCH 4/5] display: add display_colordata_dev_cal0.pb file add LHBM compensation tuning Bug: 224528172 Test: Check displaycolor log and LHBM function. Change-Id: I9e8f3e0cd413bc58b22e5290c157bdf27d7b9427 --- device-lynx.mk | 4 ++++ lynx/display_colordata_dev_cal0.pb | Bin 0 -> 1833 bytes 2 files changed, 4 insertions(+) create mode 100644 lynx/display_colordata_dev_cal0.pb diff --git a/device-lynx.mk b/device-lynx.mk index 1e0a391..c5ba74a 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -47,6 +47,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/lynx/media_profiles_lynx.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml +# Display Config +PRODUCT_COPY_FILES += \ + device/google/lynx/lynx/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb + # NFC PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ diff --git a/lynx/display_colordata_dev_cal0.pb b/lynx/display_colordata_dev_cal0.pb new file mode 100644 index 0000000000000000000000000000000000000000..e0e841755b10300c191b13b7c31356dfaa9cb821 GIT binary patch literal 1833 zcmd7St8Uw19ES1vd_E+xopWLhMv>O0t*Z@fyMSr8kTz*mscWZX17&{@P)!B_1BM2b zW)R?M1_l8i2rvi;C@3f}2na9;FbD`(R=NxfrFZa1KfN#ik;PQZ#2QM!{i*-;>b%*v zx(8>c2QB$^d%v^SY8|%DT2`m~=H+?!s@rRS>2}PM8?$rK|9siLF;A~AuY2a@#YwN- zyLnH1c=fIk5Ik!gTh0BW11tN3;J;x!u1Y4D4ZvQ!1#F59@fkiOri4vKC`bVnsgOY#$f7LdP!2StfsS-AkO6s=hXN`<5f!0? zN>D~+sGtf|Q59;a26a>iGy9xkO3x{#@r&S@{iDNX%R1VohOh~~#seZHd@><@DxpSn zLI=!(@z|6daSJZwmwX_kLMX1qKuV=hPUS#ZDS?`*Q zlP9xvVO&g$erZ|q%Sm}uNh)4-UUh4aHK%^RO>LJkf2r*<=1Hw(SxxKsA8I~6$M1+a z;gT`wQZePyG3_!jrg$wP^E>VLjcxwB5yQG230tZ%ZDGi~s-t literal 0 HcmV?d00001 From 28dd1cbe294511c1cb3ed9d800d3b5ad21347ab4 Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Wed, 1 Jun 2022 03:58:55 +0000 Subject: [PATCH 5/5] Enable hide cutout emulations Bug: 234107076 Test: make Change-Id: I5b28c20b8ac99f400c5d8a085225349c5ac383a4 --- device-lynx.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/device-lynx.mk b/device-lynx.mk index c5ba74a..39eb5a9 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -169,3 +169,12 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Set zram size PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g + +# Set support hide display cutout feature +PRODUCT_PRODUCT_PROPERTIES += \ + ro.support_hide_display_cutout=true + +# Hide cutout overlays +PRODUCT_PACKAGES += \ + NoCutoutOverlay \ + AvoidAppsInCutoutOverlay