From 5dc47062e11321b1e7e5c98339f7893220fffda4 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 17 May 2022 02:19:49 +0000 Subject: [PATCH 1/6] Update raven SVN to 29 Bug: 231380374 Change-Id: Ibd95cc73a65f3eb356f16c1c38e34684340f6636 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index e3fb280..1069aac 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -187,7 +187,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=28 + ro.vendor.build.svn=29 # Hide cutout overlays PRODUCT_PACKAGES += \ From 531b2600a54b762dc198deba8853bbe83677e0a0 Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 30 Mar 2022 22:13:09 +0800 Subject: [PATCH 2/6] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Merged-In: Ifde6ab418a18a10b11911cd2e8459f769587f685 Change-Id: Ifde6ab418a18a10b11911cd2e8459f769587f685 --- device-oriole.mk | 3 +-- device-raven.mk | 3 +-- device-slider.mk | 3 +-- device-whitefin.mk | 5 +---- nfc/libnfc-hal-st-debug.conf | 4 ++-- nfc/libnfc-hal-st-disable.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 33d2c3b..0981059 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -110,7 +110,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -122,7 +122,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # Vibrator HAL diff --git a/device-raven.mk b/device-raven.mk index 5878bf0..eb39732 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -125,7 +125,7 @@ endif PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -137,7 +137,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # Vibrator HAL diff --git a/device-slider.mk b/device-slider.mk index 72fa1ec..0657a86 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -96,7 +96,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # PowerStats HAL diff --git a/device-whitefin.mk b/device-whitefin.mk index 370f885..06613a6 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -75,10 +75,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st - -DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml + android.hardware.nfc-service.st # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin diff --git a/nfc/libnfc-hal-st-debug.conf b/nfc/libnfc-hal-st-debug.conf index 5fdaf5e..3b3e1ee 100644 --- a/nfc/libnfc-hal-st-debug.conf +++ b/nfc/libnfc-hal-st-debug.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/libnfc-hal-st-disable.conf b/nfc/libnfc-hal-st-disable.conf index 2b455df..165665e 100644 --- a/nfc/libnfc-hal-st-disable.conf +++ b/nfc/libnfc-hal-st-disable.conf @@ -64,8 +64,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/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index 0035a70..b7599c7 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 From fe94a8e370f7655743580e92de26dd0c6bdb0fe4 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 17 May 2022 02:18:17 +0000 Subject: [PATCH 3/6] Update oriole SVN to 29 Bug: 231380374 Change-Id: I76522b37ddbccc5c652ca8913d4865df0687a941 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index af538b4..e95186c 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -175,7 +175,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=28 + ro.vendor.build.svn=29 # Hide cutout overlays PRODUCT_PACKAGES += \ From 92d180a8e821aae3b1ba7b4cd09dadf7282cfcf5 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Sun, 8 May 2022 23:11:52 -0700 Subject: [PATCH 4/6] Remove FPS based hints for TA boost Bug: 205369368 Test: Build Change-Id: I063f8aa6d77b966d50d11c0135880ff787870e07 Signed-off-by: Wei Wang --- powerhint-oriole.json | 3 +-- powerhint-raven.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 9a1a0b2..845f8c0 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -145,7 +145,6 @@ "553", "185", "1", - "128", "55" ], "ResetOnInit": true @@ -1237,7 +1236,7 @@ "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "128" + "Value": "55" }, { "PowerHint": "REFRESH_60FPS", diff --git a/powerhint-raven.json b/powerhint-raven.json index 40e952e..d7b9c10 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -145,7 +145,6 @@ "553", "185", "1", - "183", "55" ], "ResetOnInit": true @@ -1248,7 +1247,7 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "183" + "Value": "55" }, { "PowerHint": "REFRESH_60FPS", From f680529e42ac3aa8a20f0aa31a44e1ee8918cead Mon Sep 17 00:00:00 2001 From: chasewu Date: Thu, 14 Apr 2022 15:30:02 +0800 Subject: [PATCH 5/6] vibrator: add device specific constants Add device specific constants required for calculating the bandwidth amplitude map Bug: 230807667 Test: verify the property values on P21 devices Signed-off-by: chasewu Change-Id: I9716e3d39e4196825baeebec5c968e470aa644ee --- device-oriole.mk | 4 +++- device-raven.mk | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 6b0468e..53602c1 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -135,7 +135,9 @@ DEVICE_MANIFEST_FILE += \ # Vibrator HAL PRODUCT_PRODUCT_PROPERTIES +=\ - ro.vendor.vibrator.hal.long.frequency.shift=15 + ro.vendor.vibrator.hal.long.frequency.shift=15 \ + ro.vendor.vibrator.hal.device.mass=0.205 \ + ro.vendor.vibrator.hal.loc.coeff=2.25 ACTUATOR_MODEL := luxshare_ict_081545 diff --git a/device-raven.mk b/device-raven.mk index db274e3..0a8f1de 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -151,7 +151,9 @@ DEVICE_MANIFEST_FILE += \ # Vibrator HAL PRODUCT_PRODUCT_PROPERTIES +=\ - ro.vendor.vibrator.hal.long.frequency.shift=15 + ro.vendor.vibrator.hal.long.frequency.shift=15 \ + ro.vendor.vibrator.hal.device.mass=0.21 \ + ro.vendor.vibrator.hal.loc.coeff=2.5 ACTUATOR_MODEL := luxshare_ict_081545 From 33af5d261fe8245d2bb1a4c43b2f45fa0c25da4a Mon Sep 17 00:00:00 2001 From: George Chang Date: Thu, 19 May 2022 13:38:21 +0000 Subject: [PATCH 6/6] Revert "Switch NFC from HIDL to AIDL" Revert "Update nfc from hidl to aidl service" Revert submission 2098739-nfc_aidl_switch_gs101 Reason for revert: broken tests Reverted Changes: Ifde6ab418:Switch NFC from HIDL to AIDL I288474f69:Update nfc from hidl to aidl service Bug: 233194621 Change-Id: Ic905a34265439db0f3d24c3514686cac52d99edb --- device-oriole.mk | 3 ++- device-raven.mk | 3 ++- device-slider.mk | 3 ++- device-whitefin.mk | 5 ++++- nfc/libnfc-hal-st-debug.conf | 4 ++-- nfc/libnfc-hal-st-disable.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 0981059..33d2c3b 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -110,7 +110,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -122,6 +122,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf DEVICE_MANIFEST_FILE += \ + device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # Vibrator HAL diff --git a/device-raven.mk b/device-raven.mk index eb39732..5878bf0 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -125,7 +125,7 @@ endif PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -137,6 +137,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf DEVICE_MANIFEST_FILE += \ + device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # Vibrator HAL diff --git a/device-slider.mk b/device-slider.mk index 0657a86..72fa1ec 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -96,6 +96,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ + device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # PowerStats HAL diff --git a/device-whitefin.mk b/device-whitefin.mk index 06613a6..370f885 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -75,7 +75,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st + +DEVICE_MANIFEST_FILE += \ + device/google/raviole/nfc/manifest_nfc.xml # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin diff --git a/nfc/libnfc-hal-st-debug.conf b/nfc/libnfc-hal-st-debug.conf index 3b3e1ee..5fdaf5e 100644 --- a/nfc/libnfc-hal-st-debug.conf +++ b/nfc/libnfc-hal-st-debug.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# Allow list to be set at startup. -DEVICE_HOST_ALLOW_LIST={02:C0} +# White list to be set at startup. +DEVICE_HOST_WHITE_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st-disable.conf b/nfc/libnfc-hal-st-disable.conf index 165665e..2b455df 100644 --- a/nfc/libnfc-hal-st-disable.conf +++ b/nfc/libnfc-hal-st-disable.conf @@ -64,8 +64,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# Allow list to be set at startup. -DEVICE_HOST_ALLOW_LIST={02:C0} +# White list to be set at startup. +DEVICE_HOST_WHITE_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index b7599c7..0035a70 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" ############################################################################### -# Allow list to be set at startup. -DEVICE_HOST_ALLOW_LIST={02:C0} +# White list to be set at startup. +DEVICE_HOST_WHITE_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P