From a17c45af94c34049a55fcc47d328f58414c09e93 Mon Sep 17 00:00:00 2001 From: lbill Date: Thu, 1 Jul 2021 13:39:17 +0000 Subject: [PATCH 01/57] Adjust status bar rounded corner and display cutout region - Customize status_bar_height_portrait/landscape/keyguard - Adjust punch hole display cutout region - Adjust rounded radius for window corner Test: atest SystemUITests Test: atest android.systemui.cts.WindowInsetsBehaviorTests Test: manual check visual Bug: 190381022 Change-Id: If98f721f3e20270c5edfdc3b2f34ff8b8af41de4 --- .../base/core/res/res/values/config.xml | 19 +++++++++++++++---- .../packages/SystemUI/res/values/dimens.xml | 6 ++++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index b39b485..b2b1360 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -33,17 +33,17 @@ - M 655,0 - h 126 + M 653,0 + h 130 v 130 - h -126 + h -130 Z @left - 25px + 38px 5px @@ -168,4 +168,15 @@ 0.3 + + + 145px + 28dp + + + 145px + + + @*android:dimen/status_bar_height_portrait diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 9de5e14..68c8115 100644 --- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -17,7 +17,10 @@ --> - 5px + 50px + + + 1px 940px From 58bd1ba9d9c4c2e54f37d52d784ba11609569938 Mon Sep 17 00:00:00 2001 From: jiabin Date: Fri, 16 Jul 2021 22:34:35 +0000 Subject: [PATCH 02/57] Add distortion output gain for Pixel 6. The value will be used in HapticGenerator. The value is from UX experiments. Test: make Bug: 193926091 Change-Id: I314aa5bc79ba756cdde4a03b0addd44eb69b27a3 Merged-In: I314aa5bc79ba756cdde4a03b0addd44eb69b27a3 --- device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index f774537..1173ea8 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -162,3 +162,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Enable camera exif model/make reporting PRODUCT_PRODUCT_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true + +# Override default distortion output gain according to UX experiments +PRODUCT_PRODUCT_PROPERTIES += \ + vendor.audio.hapticgenerator.distortion.output.gain=0.5 diff --git a/device-raven.mk b/device-raven.mk index b0ef424..f06e01d 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -163,3 +163,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Enable camera exif model/make reporting PRODUCT_PRODUCT_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true + +# Override default distortion output gain according to UX experiments +PRODUCT_PRODUCT_PROPERTIES += \ + vendor.audio.hapticgenerator.distortion.output.gain=0.5 From 8968475ceb6a8e7e87e733242349d92b350dc87d Mon Sep 17 00:00:00 2001 From: YiHo Cheng Date: Thu, 5 Aug 2021 17:50:15 +0800 Subject: [PATCH 03/57] thermal: Update thermal table Update pid related settings to get thermal pid control work for o6 proto. Bug: 195619657 Test: run burn8 and emul_temp to check if pid thermal control work Change-Id: I82e1a9271cef480b7a4cf33fe0d827316521e93c --- thermal_info_config_oriole_WHI_A.json | 43 ++++++++++++++------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json index fad145a..ba7f348 100644 --- a/thermal_info_config_oriole_WHI_A.json +++ b/thermal_info_config_oriole_WHI_A.json @@ -163,22 +163,23 @@ "Monitor":true, "PollingDelay":60000, "PassiveDelay":7000, - "ThrottleType":["None", "None", "None", "PID", "LIMIT", "LIMIT", "LIMIT"], - "K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", "NAN", 10, "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", "NAN", 10, "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", "NAN", 500, "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", "NAN", 4000, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", "NAN", 2000, "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", "NAN", 7000, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", "NAN", 1, "NAN", "NAN", "NAN"], + "PIDInfo": { + "K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 10, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 10, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 500, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 4000, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 2000, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 7000, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 1, "NAN", "NAN", "NAN"] + }, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-0", "CdevWeightForPID": [0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9], - "CdevCeiling": [6, 6, 6, 7, 8, 10, 10], - "LimitInfo": [0, 0, 0, 7, 8, 10, 10], + "CdevCeiling": [5, 5, 5, 6, 7, 9, 9], + "LimitInfo": [0, 0, 0, 0, 7, 9, 9], "BindedPowerRail": "S4M_VDD_CPUCL0", "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], "ReleaseLogic": "DECREASE" @@ -186,8 +187,8 @@ { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [1.1, 1.1, 1.1, 1.1, 1.1, 1.1, 1.1], - "CdevCeiling": [7, 7, 7, 8, 9, 11, 11], - "LimitInfo": [0, 0, 0, 8, 9, 11, 11], + "CdevCeiling": [9, 9, 9, 10, 11, 13, 13], + "LimitInfo": [0, 0, 0, 0, 11, 13, 13], "BindedPowerRail": "S3M_VDD_CPUCL1", "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], "ReleaseLogic": "DECREASE" @@ -195,8 +196,8 @@ { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [2.9, 2.9, 2.9, 2.9, 2.9, 2.9, 2.9], - "CdevCeiling": [10, 10, 10, 11, 12, 14, 14], - "LimitInfo": [0, 0, 0, 11, 12, 14, 14], + "CdevCeiling": [6, 6, 6, 7, 8, 11, 11], + "LimitInfo": [0, 0, 0, 0, 8, 11, 11], "BindedPowerRail": "S2M_VDD_CPUCL2", "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], "ReleaseLogic": "DECREASE" @@ -205,7 +206,7 @@ "CdevRequest": "thermal-gpufreq-0", "CdevWeightForPID": [3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3], "CdevCeiling": [1, 1, 1, 2, 3, 4, 4], - "LimitInfo": [0, 0, 0, 2, 3, 4, 4], + "LimitInfo": [0, 0, 0, 0, 3, 4, 4], "BindedPowerRail": "S2S_VDD_G3D", "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], "ReleaseLogic": "DECREASE" @@ -717,25 +718,25 @@ "Name":"thermal-cpufreq-0", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["1100", "1050", "1000", "950", "900", "850", "800", "750", "700", "650", "600"] + "State2Power":["420", "332", "268", "212", "176", "148", "108", "80", "56", "24"] }, { "Name":"thermal-cpufreq-1", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":["1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"] + "State2Power":["1216", "1018", "842", "686", "538", "428", "336", "274", "212", "178", "146", "118", "86", "56"] }, { "Name":"thermal-cpufreq-2", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":["1450", "1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"] + "State2Power":["2322", "1992", "1674", "1412", "1168", "936", "766", "590", "474", "394", "310", "162"] }, { "Name":"thermal-gpufreq-0", "Type":"GPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", - "State2Power":["1100", "1000", "900", "800", "700"] + "State2Power":["2580", "2033", "1427", "826", "358"] } ], "PowerRails":[ From b256283d73daf13b80a809b2e6fd12b46a6fb570 Mon Sep 17 00:00:00 2001 From: George Chang Date: Tue, 17 Aug 2021 00:51:25 +0800 Subject: [PATCH 04/57] Move NFC/eSE settings Bug: 196825539 Test: build pass Merged-In: I590f069139f641d886e1252e3acdb19483b7fcaa Change-Id: I590f069139f641d886e1252e3acdb19483b7fcaa --- conf/init.raviole.rc | 5 +++++ conf/init.slider.rc | 5 +++++ conf/init.whitefin.rc | 5 +++++ device-oriole.mk | 22 +++++++++++++++++++++- device-raven.mk | 23 ++++++++++++++++++++++- device-slider.mk | 30 +++++++++++++++++++++++++----- device-whitefin.mk | 17 ++++++++++++++++- nfc/libse-gto-hal.conf | 2 ++ nfc/libse-gto-hal2.conf | 2 ++ nfc/manifest_nfc.xml | 11 +++++++++++ nfc/manifest_se.xml | 7 +++++++ 11 files changed, 121 insertions(+), 8 deletions(-) create mode 100644 nfc/libse-gto-hal.conf create mode 100644 nfc/libse-gto-hal2.conf create mode 100644 nfc/manifest_nfc.xml create mode 100644 nfc/manifest_se.xml diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc index a14423d..d2ef216 100644 --- a/conf/init.raviole.rc +++ b/conf/init.raviole.rc @@ -1,5 +1,10 @@ # Raven/Oriole specific init.rc +on init + # NFC streset tool name + setprop persist.vendor.nfc.streset libstreset21 + setprop persist.vendor.se.streset libstreset21 + on init && property:ro.vendor.factory=1 import /vendor/etc/init/hw/init.factory.rc diff --git a/conf/init.slider.rc b/conf/init.slider.rc index a6c8d2c..f8506a5 100644 --- a/conf/init.slider.rc +++ b/conf/init.slider.rc @@ -1,6 +1,11 @@ # Slider specific init.rc import /vendor/etc/init/hw/init.gs101.rc +on init + # NFC streset tool name + setprop persist.vendor.nfc.streset libstreset21 + setprop persist.vendor.se.streset libstreset21 + # When ro.build.flavor=factory_slider-userdebug, add vendor/bin/factory to default path on init && property:ro.build.flavor=factory_slider-userdebug import /vendor/etc/init/hw/init.factory.rc diff --git a/conf/init.whitefin.rc b/conf/init.whitefin.rc index e0fe9d9..f74abbb 100644 --- a/conf/init.whitefin.rc +++ b/conf/init.whitefin.rc @@ -1,6 +1,11 @@ # Whitefin specific init.rc import /vendor/etc/init/hw/init.gs101.rc +on init + # NFC streset tool name + setprop persist.vendor.nfc.streset libstreset21 + setprop persist.vendor.se.streset libstreset21 + on init && property:ro.build.flavor=factory_whitefin-userdebug import /vendor/etc/init/hw/init.factory.rc diff --git a/device-oriole.mk b/device-oriole.mk index d0da164..e7d0373 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -91,12 +91,32 @@ PRODUCT_COPY_FILES += \ # NFC PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ + frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \ + frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \ + frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \ + frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \ + frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \ device/google/raviole/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf +PRODUCT_PACKAGES += \ + NfcNci \ + Tag \ + android.hardware.nfc@1.2-service.st + +# SecureElement +PRODUCT_PACKAGES += \ + android.hardware.secure_element@1.2-service-gto + +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.ese.xml \ + frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml \ + device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf DEVICE_MANIFEST_FILE += \ - device/google/gs101/nfc/manifest_se_gs101.xml + device/google/raviole/nfc/manifest_nfc.xml \ + device/google/raviole/nfc/manifest_se.xml # Vibrator HAL PRODUCT_PRODUCT_PROPERTIES +=\ diff --git a/device-raven.mk b/device-raven.mk index ceb1458..321c8d3 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -94,11 +94,32 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.brightness.dimming.usage=2 # NFC PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ + frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \ + frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \ + frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \ + frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \ + frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \ device/google/raviole/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ device/google/raviole/nfc/libnfc-nci-raven.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf +PRODUCT_PACKAGES += \ + NfcNci \ + Tag \ + android.hardware.nfc@1.2-service.st + +# SecureElement +PRODUCT_PACKAGES += \ + android.hardware.secure_element@1.2-service-gto + +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.ese.xml \ + frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml \ + device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf + DEVICE_MANIFEST_FILE += \ - device/google/gs101/nfc/manifest_se_gs101.xml + device/google/raviole/nfc/manifest_nfc.xml \ + device/google/raviole/nfc/manifest_se.xml # Vibrator HAL PRODUCT_PRODUCT_PROPERTIES +=\ diff --git a/device-slider.mk b/device-slider.mk index f4e6b57..456c51e 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -57,20 +57,40 @@ PRODUCT_PROPERTY_OVERRIDES += \ # SecureElement PRODUCT_PACKAGES += \ - android.hardware.secure_element@1.2-service-gto \ - android.hardware.secure_element@1.2-service-gto-ese2 + android.hardware.secure_element@1.2-service-gto PRODUCT_COPY_FILES += \ - device/google/gs101/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \ - device/google/gs101/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf + device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf # NFC PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ + frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \ + frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \ + frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \ + frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \ + frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \ device/google/raviole/nfc/libnfc-hal-st-disable.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf +PRODUCT_PACKAGES += \ + NfcNci \ + Tag \ + android.hardware.nfc@1.2-service.st + +# SecureElement +PRODUCT_PACKAGES += \ + android.hardware.secure_element@1.2-service-gto + +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.ese.xml \ + frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml \ + device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \ + device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf + DEVICE_MANIFEST_FILE += \ - device/google/gs101/nfc/manifest_se_gs101.xml + device/google/raviole/nfc/manifest_nfc.xml \ + device/google/raviole/nfc/manifest_se.xml # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/slider diff --git a/device-whitefin.mk b/device-whitefin.mk index 17e4d45..3202f0e 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -56,7 +56,22 @@ PRODUCT_PRODUCT_PROPERTIES += \ # NFC PRODUCT_COPY_FILES += \ - device/google/gs101/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf + frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ + frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \ + frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \ + frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \ + frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \ + frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml \ + device/google/raviole/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ + device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf + +PRODUCT_PACKAGES += \ + NfcNci \ + Tag \ + 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/libse-gto-hal.conf b/nfc/libse-gto-hal.conf new file mode 100644 index 0000000..f4e443d --- /dev/null +++ b/nfc/libse-gto-hal.conf @@ -0,0 +1,2 @@ +#Gemalto SPI devnode +GTO_DEV=/dev/st54spi; diff --git a/nfc/libse-gto-hal2.conf b/nfc/libse-gto-hal2.conf new file mode 100644 index 0000000..13ecd54 --- /dev/null +++ b/nfc/libse-gto-hal2.conf @@ -0,0 +1,2 @@ +#Gemalto SPI devnode +GTO_DEV=/dev/st33spi; diff --git a/nfc/manifest_nfc.xml b/nfc/manifest_nfc.xml new file mode 100644 index 0000000..bf6b7cc --- /dev/null +++ b/nfc/manifest_nfc.xml @@ -0,0 +1,11 @@ + + + android.hardware.nfc + hwbinder + 1.2 + + INfc + default + + + diff --git a/nfc/manifest_se.xml b/nfc/manifest_se.xml new file mode 100644 index 0000000..9e5cee9 --- /dev/null +++ b/nfc/manifest_se.xml @@ -0,0 +1,7 @@ + + + android.hardware.secure_element + hwbinder + @1.2::ISecureElement/eSE1 + + From adcaf475dba29173e9b9c608cec88a7ba5162f49 Mon Sep 17 00:00:00 2001 From: Michael Ayoubi Date: Wed, 25 Aug 2021 01:06:28 +0000 Subject: [PATCH 05/57] Move dck.eligible_wcc back to 3 for R4 Move ro.gms.dck.eligible_wcc back to 3 for R4 for QPR2. Bug: b/192409856 Test: Build and test on R4 Signed-off-by: Michael Ayoubi Change-Id: I27c59fb69e99b426e82a4054cb97f175c7e2953a --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index e68ac35..8320d06 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -182,7 +182,7 @@ PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_l=11 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=2 + ro.gms.dck.eligible_wcc=3 # SKU specific RROs PRODUCT_PACKAGES += \ From 85d8c0baab9c1c6c60749d9f247fa52f8a5b8542 Mon Sep 17 00:00:00 2001 From: leohsieh Date: Mon, 30 Aug 2021 22:22:49 +0800 Subject: [PATCH 06/57] raviole: Add GOODIX_CONFIG_BUILD_VERSION to device mk Move GOODIX_CONFIG_BUILD_VERSION to device mk. Fixes "There is no fp HAL on factory build". Bug: 197213960 Test: lunch oriole-userdebug Test: lunch factory_oriole-userdebug Test: lunch bluejay-userdebug Test: lunch factory_bluejay-userdebug Test: lunch oriole_hwasan-userdebug Change-Id: I79b4fc7e5a15ebf3a186149b94f63b9f2b7d9d0c --- device-oriole.mk | 1 + device-raven.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 5e5470b..edac3ca 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -24,6 +24,7 @@ $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/orio $(call inherit-product-if-exists, vendor/google/camera/devices/raviole/oriole/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/WallpapersOriole.mk) +GOODIX_CONFIG_BUILD_VERSION := g6_trusty DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay include device/google/raviole/audio/oriole/audio-tables.mk diff --git a/device-raven.mk b/device-raven.mk index 8320d06..f88e9fb 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -24,6 +24,7 @@ $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/rave $(call inherit-product-if-exists, vendor/google/camera/devices/raviole/raven/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/WallpapersRaven.mk) +GOODIX_CONFIG_BUILD_VERSION := g6_trusty DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay include device/google/raviole/audio/raven/audio-tables.mk From 6f51c2af19469f62c82b764e59321438130e57de Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Tue, 31 Aug 2021 21:45:53 +0800 Subject: [PATCH 07/57] raviole: enable WirelessCharger Bug: 198221475 Test: WirelessCharger can work Signed-off-by: Jack Wu Change-Id: I7e89c22bb4271c0da1512ef9a3ab5f7b38a86b06 --- device-oriole.mk | 3 +++ device-raven.mk | 3 +++ device-slider.mk | 3 +++ device-whitefin.mk | 3 +++ 4 files changed, 12 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index edac3ca..8f631e8 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -75,6 +75,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES_DEBUG += \ sar_test +# WirelessCharger +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml + # MIPI Coex Configs PRODUCT_COPY_FILES += \ device/google/raviole/radio/oriole_display_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv \ diff --git a/device-raven.mk b/device-raven.mk index f88e9fb..adff919 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -79,6 +79,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES_DEBUG += \ sar_test +# WirelessCharger +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml + # MIPI Coex Configs PRODUCT_COPY_FILES += \ device/google/raviole/radio/raven_camera_rear_tele_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_rear_tele_mipi_coex_table.csv diff --git a/device-slider.mk b/device-slider.mk index 456c51e..0d2cf6a 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -27,6 +27,9 @@ include device/google/gs101/device-common.mk include device/google/raviole/audio/slider/audio-tables.mk include hardware/google/pixel/vibrator/cs40l25/device.mk +# WirelessCharger +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml + # Init files PRODUCT_COPY_FILES += \ device/google/raviole/conf/init.slider.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.slider.rc diff --git a/device-whitefin.mk b/device-whitefin.mk index 3202f0e..fc243c2 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -27,6 +27,9 @@ include device/google/gs101/device-common.mk include hardware/google/pixel/vibrator/drv2624/device.mk include device/google/raviole/audio/whitefin/audio-tables.mk +# WirelessCharger +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml + # Init files PRODUCT_COPY_FILES += \ device/google/raviole/conf/init.whitefin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.whitefin.rc From 63d0be6f7e9910bf3a40df5df49a5dc885f66591 Mon Sep 17 00:00:00 2001 From: Vince Leung Date: Fri, 27 Aug 2021 20:07:54 +0000 Subject: [PATCH 08/57] haptics: add raviole actuator model Bug: 195894512 Test: verified actuator model config propogated and handled properly by vibrator HAL Change-Id: I17eae6e05b51e1e0065546b9c841e92c30e2af72 --- device-oriole.mk | 1 + device-raven.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 2a16c40..9a2221b 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -128,6 +128,7 @@ PRODUCT_PRODUCT_PROPERTIES +=\ ro.vendor.vibrator.hal.long.frequency.shift=15 PRODUCT_PRODUCT_PROPERTIES += \ vendor.powerhal.adpf.rate=11111111 +ACTUATOR_MODEL := luxshare_ict_081545 # Voice packs for Text-To-Speech PRODUCT_COPY_FILES += \ diff --git a/device-raven.mk b/device-raven.mk index 34b4102..0ce1bc4 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -133,6 +133,7 @@ PRODUCT_PRODUCT_PROPERTIES +=\ ro.vendor.vibrator.hal.long.frequency.shift=15 PRODUCT_PRODUCT_PROPERTIES += \ vendor.powerhal.adpf.rate=8333333 +ACTUATOR_MODEL := luxshare_ict_081545 # Voice packs for Text-To-Speech PRODUCT_COPY_FILES += \ From e084e23e3c911c267b022510854c4fd5b824355a Mon Sep 17 00:00:00 2001 From: Martin Liu Date: Thu, 30 Sep 2021 16:53:14 +0000 Subject: [PATCH 09/57] Zram: set zram size Apply 3G zram size settings Bug: 200899926 Test: boot Signed-off-by: Martin Liu Change-Id: I94e9390719833ae54be56ca3c2aeba4bd9cd9d27 Merged-In: I94e9390719833ae54be56ca3c2aeba4bd9cd9d27 --- conf/init.raviole.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc index ed55764..03baef9 100644 --- a/conf/init.raviole.rc +++ b/conf/init.raviole.rc @@ -52,3 +52,6 @@ on post-fs-data on property:ro.revision=PROTO1.0 setprop persist.fingerprint.ghbm true + +on late-fs + setprop vendor.zram.size 3GB From e0f6a5cd38c2734b750c82ede33ff912ce272411 Mon Sep 17 00:00:00 2001 From: Martin Liu Date: Tue, 5 Oct 2021 12:40:33 +0000 Subject: [PATCH 10/57] zram: add zram size property Bug: 200899926 Test: check zram swap and backing device Signed-off-by: Martin Liu Change-Id: Ife748938f5e7cfb34c343a3f568c93824f33e8fe Merged-In: Ife748938f5e7cfb34c343a3f568c93824f33e8fe --- conf/init.raviole.rc | 3 --- device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc index 03baef9..ed55764 100644 --- a/conf/init.raviole.rc +++ b/conf/init.raviole.rc @@ -52,6 +52,3 @@ on post-fs-data on property:ro.revision=PROTO1.0 setprop persist.fingerprint.ghbm true - -on late-fs - setprop vendor.zram.size 3GB diff --git a/device-oriole.mk b/device-oriole.mk index 4ffd73d..90ca6f8 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -204,3 +204,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Override default distortion output gain according to UX experiments PRODUCT_PRODUCT_PROPERTIES += \ vendor.audio.hapticgenerator.distortion.output.gain=0.5 + +# Set zram size +PRODUCT_VENDOR_PROPERTIES += \ + vendor.zram.size=3g diff --git a/device-raven.mk b/device-raven.mk index 4284c3c..8e8ec48 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -210,3 +210,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Override default distortion output gain according to UX experiments PRODUCT_PRODUCT_PROPERTIES += \ vendor.audio.hapticgenerator.distortion.output.gain=0.5 + +# Set zram size +PRODUCT_VENDOR_PROPERTIES += \ + vendor.zram.size=3g From 0bc1dc0ae1bfa959a7c16693affe4d1fa5773742 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Thu, 14 Oct 2021 14:17:00 +0800 Subject: [PATCH 11/57] audio: waves: support custom action identification Bug: 203029117 Test: build pass, LR mixed Signed-off-by: Jasmine Cha Change-Id: Ib1e95efb8ea94bd187be7b681b6a94d53e0c5ce1 --- audio/oriole/tuning/waves/waves_config.ini | 9 +++++++++ audio/raven/tuning/waves/waves_config.ini | 9 +++++++++ audio/slider/tuning/waves/waves_config.ini | 9 +++++++++ audio/whitefin/tuning/waves/waves_config.ini | 9 +++++++++ 4 files changed, 36 insertions(+) diff --git a/audio/oriole/tuning/waves/waves_config.ini b/audio/oriole/tuning/waves/waves_config.ini index 99b9604..ba12a8e 100644 --- a/audio/oriole/tuning/waves/waves_config.ini +++ b/audio/oriole/tuning/waves/waves_config.ini @@ -1,3 +1,12 @@ +######################################################################################################## +# (Optional) The supported features list for platform vendors to query from. +# Platform vendors should call maxxaudio_qdsp_is_feature_supported with a string to query from the list. +# This config has no effect in the MaxxAudioQdspHalController. It's only meaningful for platform vendors. +# Putting any value other than 1 would be equivalent to not supported. +######################################################################################################## +[HAL_SUPPORTED_FEATURES] +CUSTOM_ACTION_256=1 + ######################################################################################################## # This defined the options of supported sample rates. # This can be configured by Waves or platform vendor. diff --git a/audio/raven/tuning/waves/waves_config.ini b/audio/raven/tuning/waves/waves_config.ini index 99b9604..ba12a8e 100644 --- a/audio/raven/tuning/waves/waves_config.ini +++ b/audio/raven/tuning/waves/waves_config.ini @@ -1,3 +1,12 @@ +######################################################################################################## +# (Optional) The supported features list for platform vendors to query from. +# Platform vendors should call maxxaudio_qdsp_is_feature_supported with a string to query from the list. +# This config has no effect in the MaxxAudioQdspHalController. It's only meaningful for platform vendors. +# Putting any value other than 1 would be equivalent to not supported. +######################################################################################################## +[HAL_SUPPORTED_FEATURES] +CUSTOM_ACTION_256=1 + ######################################################################################################## # This defined the options of supported sample rates. # This can be configured by Waves or platform vendor. diff --git a/audio/slider/tuning/waves/waves_config.ini b/audio/slider/tuning/waves/waves_config.ini index 99b9604..ba12a8e 100644 --- a/audio/slider/tuning/waves/waves_config.ini +++ b/audio/slider/tuning/waves/waves_config.ini @@ -1,3 +1,12 @@ +######################################################################################################## +# (Optional) The supported features list for platform vendors to query from. +# Platform vendors should call maxxaudio_qdsp_is_feature_supported with a string to query from the list. +# This config has no effect in the MaxxAudioQdspHalController. It's only meaningful for platform vendors. +# Putting any value other than 1 would be equivalent to not supported. +######################################################################################################## +[HAL_SUPPORTED_FEATURES] +CUSTOM_ACTION_256=1 + ######################################################################################################## # This defined the options of supported sample rates. # This can be configured by Waves or platform vendor. diff --git a/audio/whitefin/tuning/waves/waves_config.ini b/audio/whitefin/tuning/waves/waves_config.ini index 99b9604..ba12a8e 100644 --- a/audio/whitefin/tuning/waves/waves_config.ini +++ b/audio/whitefin/tuning/waves/waves_config.ini @@ -1,3 +1,12 @@ +######################################################################################################## +# (Optional) The supported features list for platform vendors to query from. +# Platform vendors should call maxxaudio_qdsp_is_feature_supported with a string to query from the list. +# This config has no effect in the MaxxAudioQdspHalController. It's only meaningful for platform vendors. +# Putting any value other than 1 would be equivalent to not supported. +######################################################################################################## +[HAL_SUPPORTED_FEATURES] +CUSTOM_ACTION_256=1 + ######################################################################################################## # This defined the options of supported sample rates. # This can be configured by Waves or platform vendor. From 4d3426fe726cf08003845b528a397a4eb145492c Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 20 Oct 2021 09:58:37 -0700 Subject: [PATCH 12/57] Add two permission files TEST: build BUG: 201551519 Change-Id: Ib9adac90e801bd437efc03e03d2f9dd17b239e49 --- self-extractors_oriole/extract-lists.txt | 2 ++ self-extractors_oriole/google_devices/staging/device-partial.mk | 2 ++ self-extractors_raven/extract-lists.txt | 2 ++ self-extractors_raven/google_devices/staging/device-partial.mk | 2 ++ 4 files changed, 8 insertions(+) diff --git a/self-extractors_oriole/extract-lists.txt b/self-extractors_oriole/extract-lists.txt index 8bf7d90..0226644 100644 --- a/self-extractors_oriole/extract-lists.txt +++ b/self-extractors_oriole/extract-lists.txt @@ -5,6 +5,8 @@ RADIO/bootloader.img \ RADIO/radio.img \ system_ext/etc/permissions/com.shannon.imsservice.xml \ + system_ext/etc/permissions/com.shannon.qualifiednetworksservice.xml \ + system_ext/etc/permissions/com.shannon.rcsservice.xml \ system_ext/etc/permissions/oemrilhook.xml \ system_ext/framework/oemrilhook.jar \ system_ext/lib64/libmediaadaptor.so \ diff --git a/self-extractors_oriole/google_devices/staging/device-partial.mk b/self-extractors_oriole/google_devices/staging/device-partial.mk index 93f2359..43369da 100644 --- a/self-extractors_oriole/google_devices/staging/device-partial.mk +++ b/self-extractors_oriole/google_devices/staging/device-partial.mk @@ -27,6 +27,8 @@ PRODUCT_PACKAGES += \ # blob(s) necessary for oriole hardware PRODUCT_COPY_FILES := \ vendor/google_devices/oriole/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \ + vendor/google_devices/oriole/proprietary/com.shannon.qualifiednetworksservice.xml:system_ext/etc/permissions/com.shannon.qualifiednetworksservice.xml:samsung \ + vendor/google_devices/oriole/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \ vendor/google_devices/oriole/proprietary/oemrilhook.xml:system_ext/etc/permissions/oemrilhook.xml:samsung \ vendor/google_devices/oriole/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar:samsung \ diff --git a/self-extractors_raven/extract-lists.txt b/self-extractors_raven/extract-lists.txt index 8bf7d90..0226644 100644 --- a/self-extractors_raven/extract-lists.txt +++ b/self-extractors_raven/extract-lists.txt @@ -5,6 +5,8 @@ RADIO/bootloader.img \ RADIO/radio.img \ system_ext/etc/permissions/com.shannon.imsservice.xml \ + system_ext/etc/permissions/com.shannon.qualifiednetworksservice.xml \ + system_ext/etc/permissions/com.shannon.rcsservice.xml \ system_ext/etc/permissions/oemrilhook.xml \ system_ext/framework/oemrilhook.jar \ system_ext/lib64/libmediaadaptor.so \ diff --git a/self-extractors_raven/google_devices/staging/device-partial.mk b/self-extractors_raven/google_devices/staging/device-partial.mk index e54dcad..33cd4db 100644 --- a/self-extractors_raven/google_devices/staging/device-partial.mk +++ b/self-extractors_raven/google_devices/staging/device-partial.mk @@ -27,6 +27,8 @@ PRODUCT_PACKAGES += \ # blob(s) necessary for raven hardware PRODUCT_COPY_FILES := \ vendor/google_devices/raven/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \ + vendor/google_devices/raven/proprietary/com.shannon.qualifiednetworksservice.xml:system_ext/etc/permissions/com.shannon.qualifiednetworksservice.xml:samsung \ + vendor/google_devices/raven/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \ vendor/google_devices/raven/proprietary/oemrilhook.xml:system_ext/etc/permissions/oemrilhook.xml:samsung \ vendor/google_devices/raven/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar:samsung \ From 09abab8ff36c8a010e044a795d38729cd21d8e32 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Wed, 6 Oct 2021 10:36:59 +0800 Subject: [PATCH 13/57] Jump SVN to 5 for VZW SU0 Bug: 202224700 Change-Id: Id5fb5daf7b75041212bfec50ef42dfaa89b76c89 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 22281a1..e10f126 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -143,7 +143,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=4 + ro.vendor.build.svn=5 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 0a07168..7c6e4b6 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=4 + ro.vendor.build.svn=5 # Hide cutout overlays PRODUCT_PACKAGES += \ From 1f2dc18eada3d6f72dff38456915d9da38d4ed30 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Thu, 21 Oct 2021 16:04:34 +0800 Subject: [PATCH 14/57] Jump SVN to 8 for O6R4 Dec QPR1 Bug: 203740694 Change-Id: I2b2cb7e6564b9633ce2055e2de59ba9de2fdc006 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index f008f29..a3744be 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=5 + ro.vendor.build.svn=8 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 477ec00..723844c 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -145,7 +145,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=5 + ro.vendor.build.svn=8 # Hide cutout overlays PRODUCT_PACKAGES += \ From b7cc9eee54b0601279f806167f60167324b52592 Mon Sep 17 00:00:00 2001 From: shawnlin Date: Fri, 17 Sep 2021 20:13:40 +0800 Subject: [PATCH 15/57] Remove resource overlays for system bar heights With the new added APIs, we don't need to overlay status_bar_height that contains cutout size and quick_qs_offset_height anymore. Bug: 186604541 Test: make Change-Id: Ib2ebacbc3250a1c2a2ad2b26f92eda6651fec37a --- .../base/core/res/res/values/config.xml | 14 ++++++-------- .../base/packages/SystemUI/res/values/dimens.xml | 4 ++-- .../base/core/res/res/values/config.xml | 15 ++++++--------- .../base/packages/SystemUI/res/values/dimens.xml | 4 ++-- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index 267bc29..f2bc440 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -80,9 +80,9 @@ M 492,0 - h 118 + h 124 v 118 - h -118 + h -124 Z @left @@ -90,12 +90,10 @@ 28px - - 124px - 74px - - 124px + + 74px 5px diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 29363c6..b364c4a 100644 --- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -25,8 +25,8 @@ 1px - - @*android:dimen/status_bar_height_portrait + + @*android:dimen/status_bar_height 50 - - 145px - 28dp - - - 145px + + 28dp false diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index bd8bafa..fb6ecc9 100644 --- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -22,8 +22,8 @@ 1px - - @*android:dimen/status_bar_height_portrait + + @*android:dimen/status_bar_height @@ -711,6 +712,20 @@ + + + + + + + + + + + + + + diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml index 4080c14..55d5252 100644 --- a/audio/raven/config/mixer_paths.xml +++ b/audio/raven/config/mixer_paths.xml @@ -231,6 +231,7 @@ + @@ -711,6 +712,20 @@ + + + + + + + + + + + + + + From fa1f5094d1867fe0e69affc0e720f54d93c4473d Mon Sep 17 00:00:00 2001 From: vincenttew Date: Thu, 11 Nov 2021 18:16:49 +0800 Subject: [PATCH 29/57] Revert "Update: audio tuning table" This reverts commit 4bfaa9f2f30a02b1f8cf8ba2add26c665aaf931a. revert reason: the AoC prebuilt MBDRC seems not working after pick prebuilt ag/16234618, the bug tracking on b/205934425, will apply this tuning back once the MBDRC can work correctly on sc-v2-dev Bug: 205934425 Change-Id: I24e2805675360d59d70cd2b5a9095aaf1c8a5875 Signed-off-by: vincenttew --- audio/oriole/tuning/bluenote/recording.gatf | Bin 184720 -> 183772 bytes audio/oriole/tuning/bluenote/template.xml | 4 +++- audio/raven/tuning/bluenote/recording.gatf | Bin 228660 -> 227712 bytes audio/raven/tuning/bluenote/template.xml | 4 +++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/audio/oriole/tuning/bluenote/recording.gatf b/audio/oriole/tuning/bluenote/recording.gatf index f0160d450742344b3521ac757238b890fcf7d266..2667f0c7d11d5c8f1a9d9bd4606a32153f563ba0 100644 GIT binary patch delta 1041 zcmbQRnETFbZlRLWyyPoqnHb7ai}F|)7#J8CHZSAewOS{Di-94vBr#n9D3&E9(s@90 ziY2#`&f~%Zjq`7M_Ldx39C>4A)8B*FdQ=xpcSvRw;SvDqU;?V<;MyLS%xJ|Zvi<)D zJ3f1neK8ZZ+AjK-zQ0F(iQVRfj4X`PH>5IF;FjL*kj}V?ak3j*01(fcZji+o03tq3 zzQ!Ifxs1b)k!|up4)e)>IHV>Y;xL=+!x_K{awQuOADLd5z^Fg@!*-7P5+Ij>VSxh! zgMuRi!v-L}a1i7?Ao~ylg8&dSFwC0S>A=9yU@x-nxE+WFi6OuOr&%*wf%-sZfWQJr z2>*l=gb!Bl0AzzOFyJ6S5J(9yFz^E@2L~WN0Fp>y*c`Qe*J>~1Q0=#);8zF p&RcU{24=*e1l0k4TtOu;{X#P13EUwy64Pb7Sry}Uvnr;jZ~%*-9L4|u delta 522 zcmcaJn|s1y?xd2^yyT9HOblhIMR_a?3=E7w3=~W6;bve+ElEsQ0P>ijn>+;54gRWln{69;Ms3| zjGH1%S4w1tbfUkO}Z zdZ&4o(7ZKEg + + @@ -273,7 +275,7 @@ - + diff --git a/audio/raven/tuning/bluenote/recording.gatf b/audio/raven/tuning/bluenote/recording.gatf index 61a6f5ea87c794b447d1acadc592f025e961cd2b..dba7c69edbf1b8734dba3f6aeb46d5350fff23b9 100644 GIT binary patch delta 933 zcmdn;i?`u3uS-d3UUEexGecQwQ638e0|O%v1I5w? ze8cYvjqg1!x*X%>vPr+Do*^W2w(o+N-^}dP%3=+AOj#)jK$jy}KtRk5D^#*ZwFlM~ie;7?>t akVJOjwA2s^$99V#n+i$ z)OK%)+2wLyJt}P7y_0`9bzhwqn-;y5Bf8Ib-u5}!sg=bXKy_enfZre`u_Vz4sGkWa z;KDsUD~B;}XP3_u!vJe0O diff --git a/audio/raven/tuning/bluenote/template.xml b/audio/raven/tuning/bluenote/template.xml index 52a75ba..c27188e 100644 --- a/audio/raven/tuning/bluenote/template.xml +++ b/audio/raven/tuning/bluenote/template.xml @@ -234,6 +234,8 @@ + + @@ -273,7 +275,7 @@ - + From 3d9d28975611188bdc3718dd6341da2f5504fe86 Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Thu, 11 Nov 2021 16:26:30 -0800 Subject: [PATCH 30/57] nfc: enable nfc debugging for usedebug builds Requested by vendor to help debug uwb applets Bug: 205861476 Test: build and check out/*/libnfc-hal-st.conf has debug change Signed-off-by: Victor Liu Change-Id: I748ceba61fe4f24326b1111a7f07de6c037c7dfc --- device-raven.mk | 10 +- nfc/libnfc-hal-st-debug.conf | 159 ++++++++++++++++++++++++++++++++ nfc/libnfc-nci-raven-debug.conf | 121 ++++++++++++++++++++++++ 3 files changed, 289 insertions(+), 1 deletion(-) create mode 100644 nfc/libnfc-hal-st-debug.conf create mode 100644 nfc/libnfc-nci-raven-debug.conf diff --git a/device-raven.mk b/device-raven.mk index 38f5af0..3b65e41 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -110,9 +110,17 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \ frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \ frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \ - frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \ + frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml + +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_COPY_FILES += \ + device/google/raviole/nfc/libnfc-hal-st-debug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ + device/google/raviole/nfc/libnfc-nci-raven-debug.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf +else +PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ device/google/raviole/nfc/libnfc-nci-raven.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf +endif PRODUCT_PACKAGES += \ NfcNci \ diff --git a/nfc/libnfc-hal-st-debug.conf b/nfc/libnfc-hal-st-debug.conf new file mode 100644 index 0000000..5fdaf5e --- /dev/null +++ b/nfc/libnfc-hal-st-debug.conf @@ -0,0 +1,159 @@ +########################### Start of libnf-hal-st_aosp.conf ########################### + +############################################################################### +############################################################################### +# ST HAL trace log level +STNFC_HAL_LOGLEVEL=4 +NFC_DEBUG_ENABLED=1 + +############################################################################### +# Vendor specific mode to enable FW (RF & SWP) traces. +STNFC_FW_DEBUG_ENABLED=1 + +############################################################################### +# File used for NFA storage +NFA_STORAGE="/data/nfc" + +############################################################################### +# Keep the nfa storage file. +PRESERVE_STORAGE=1 + +############################################################################### +# In Switch OFF mode (phone switched-off), specify the desired CE mode to +# the controller. +# 0: No card-emulation; DEFAULT +# 1: Switch-off card-emulation enabled +CE_ON_SWITCH_OFF_STATE=1 + +############################################################################### +# Vendor specific mode to support the USB charging mode if VPSIO=1 in switch off. +STNFC_USB_CHARGING_MODE=1 + +############################################################################### +# Vendor Specific Proprietary Protocol & Discovery Configuration +# Set to 0xFF if unsupported +# byte[0] NCI_PROTOCOL_18092_ACTIVE +# byte[1] NCI_PROTOCOL_B_PRIME +# byte[2] NCI_PROTOCOL_DUAL +# byte[3] NCI_PROTOCOL_15693 +# byte[4] NCI_PROTOCOL_KOVIO +# byte[5] NCI_PROTOCOL_MIFARE +# byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO +# byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME +# byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME +NFA_PROPRIETARY_CFG={05:FF:FF:06:8A:90:77:FF:FF} + +############################################################################### +# Choose the presence-check algorithm for type-4 tag. If not defined, +# the default value is 1. +# 0 NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm +# 1 NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block +# 2 NFA_RW_PRES_CHK_RESET; Deactivate to Sleep, then re-activate +# 3 NFA_RW_PRES_CHK_RB_CH0; Type-4 tag protocol's ReadBinary command on channel 0 +# 4 NFA_RW_PRES_CHK_RB_CH3; Type-4 tag protocol's ReadBinary command on channel 3 +# 5 NFA_RW_PRES_CHK_ISO_DEP_NAK; presence check command ISO-DEP NAK as per NCI2.0 +PRESENCE_CHECK_ALGORITHM=5 + +############################################################################### +# Name of the NCI HAL module to use +# If unset, falls back to nfc_nci.bcm2079x +NCI_HAL_MODULE="nfc_nci.st21nfc" + +############################################################################### +# White list to be set at startup. +DEVICE_HOST_WHITE_LIST={02:C0} + +############################################################################### +# BAIL OUT value for P2P +# Implements algorithm for NFC-DEP protocol priority over ISO-DEP protocol. +POLL_BAIL_OUT_MODE=1 + +############################################################################### +# Extended APDU length for ISO_DEP +ISO_DEP_MAX_TRANSCEIVE=0xFEFF + +############################################################################### +# Configure the NFC Extras to open and use a static pipe. If the value is +# not set or set to 0, then the default is use a dynamic pipe based on a +# destination gate (see NFA_HCI_DEFAULT_DEST_GATE). Note there is a value +# for each EE (ESE/SIM) +OFF_HOST_ESE_PIPE_ID=0x5E +OFF_HOST_SIM_PIPE_ID=0x3E + +############################################################################### +#Set the default Felica T3T System Code OffHost route Location : +#This settings will be used when application does not set this parameter +# host 0x00 +# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) +# UICC 0x81 (UICC_1), 0x85 (UICC_2) +DEFAULT_SYS_CODE_ROUTE=0x86 + +############################################################################### +#Set the Felica T3T System Code supported power state: +DEFAULT_SYS_CODE_PWR_STATE=0x3B + +############################################################################### +# Path and Files used for FW update binaries storage +STNFC_FW_PATH_STORAGE="/vendor/firmware" +STNFC_FW_BIN_NAME="/st54j_fw.bin" +STNFC_FW_CONF_NAME="/st54j_conf.bin" + +############################################################################### +# Default off-host route for Felica. +# This settings will be used when application does not set this parameter +# host 0x00 +# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) +# UICC 0x81 (UICC_1), 0x85 (UICC_2) +DEFAULT_NFCF_ROUTE=0x86 + +############################################################################### +# Configure the default off-host route. +# used for technology A and B routing +# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) +# UICC 0x81 (UICC_1), 0x85 (UICC_2) +DEFAULT_OFFHOST_ROUTE=0x81 + +############################################################################### +# Configure the default AID route. +# host 0x00 +# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) +# UICC 0x81 (UICC_1), 0x85 (UICC_2) +DEFAULT_ROUTE=0x00 + +############################################################################### +# Configure the NFCEEIDs of offhost UICC. +# UICC 0x81 (UICC_1), 0x85 (UICC_2) +OFFHOST_ROUTE_UICC={81} + +############################################################################### +# Configure the NFCEEIDs of offhost eSEs. +# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) +OFFHOST_ROUTE_ESE={86} + +############################################################################### +# Configure the list of NFCEE for the ISO-DEP routing. +# host 0x00 +# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) +# UICC 0x81 (UICC_1), 0x85 (UICC_2) +DEFAULT_ISODEP_ROUTE=0x81 + +############################################################################### +# Configure the HAL Clock control +# enable 0x01 +# disable 0x00 default value +STNFC_CONTROL_CLK=0x01 + +################################################################################ +# Configure the ACTIVE_RW timer +# Default 0x00, set 0x01 to enable it +STNFC_ACTIVERW_TIMER=0x01 + +################################################################################ +# Core configuration settings +CORE_CONF_PROP={ 20, 02, 0a, 03, + a1, 01, 1e, + a2, 01, 19, + 80, 01, 01 +} + + diff --git a/nfc/libnfc-nci-raven-debug.conf b/nfc/libnfc-nci-raven-debug.conf new file mode 100644 index 0000000..e530888 --- /dev/null +++ b/nfc/libnfc-nci-raven-debug.conf @@ -0,0 +1,121 @@ +############################################################################### +# Application options +NFC_DEBUG_ENABLED=1 + +############################################################################### +# File used for NFA storage +NFA_STORAGE="/data/nfc" + +############################################################################### +# Force UICC to only 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_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 +# detected. The first byte is the length of the AID. Maximum length is 16. +AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00} + +############################################################################### +# When screen is turned off, specify the desired power state of the controller. +# 0: power-off-sleep state; DEFAULT +# 1: full-power state +# 2: screen-off card-emulation (CE4/CE3/CE1 modes are used) +SCREEN_OFF_POWER_STATE=1 + +############################################################################### +# Force tag polling for 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_B | +# NFA_TECHNOLOGY_MASK_F | NFA_TECHNOLOGY_MASK_ISO15693 | +# NFA_TECHNOLOGY_MASK_B_PRIME | NFA_TECHNOLOGY_MASK_KOVIO | +# NFA_TECHNOLOGY_MASK_ACTIVE +# +# Notable bits: +# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */ +# NFA_TECHNOLOGY_MASK_B 0x02 /* NFC Technology B */ +# NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */ +# NFA_TECHNOLOGY_MASK_ISO15693 0x08 /* Proprietary Technology */ +# NFA_TECHNOLOGY_MASK_KOVIO 0x20 /* Proprietary Technology */ +# NFA_TECHNOLOGY_MASK_ACTIVE 0x40 /* NFC Technology Active */ +POLLING_TECH_MASK=0x2F + +############################################################################### +# Force P2P to only listen for 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 | +# NFA_TECHNOLOGY_MASK_ACTIVE +# +# Notable bits: +# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */ +# NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */ +# NFA_TECHNOLOGY_MASK_ACTIVE 0x40 /* NFC Technology Active */ +P2P_LISTEN_TECH_MASK=0x00 + +PRESERVE_STORAGE=0x01 + +############################################################################### +# Override the stack default for NFA_EE_MAX_EE_SUPPORTED set in nfc_target.h. +# The value is set to 3 by default as it assumes we will discover 0xF2, +# 0xF3, and 0xF4. If a platform will exclude and SE, this value can be reduced +# so that the stack will not wait any longer than necessary. +# Maximum EE supported number +# NXP PN547C2 0x02 +# NXP PN65T 0x03 +# NXP PN548C2 0x02 +# NXP PN66T 0x03 +NFA_MAX_EE_SUPPORTED=0x02 + +############################################################################### +# AID_MATCHING constants +# AID_MATCHING_EXACT_ONLY 0x00 +# AID_MATCHING_EXACT_OR_PREFIX 0x01 +# AID_MATCHING_PREFIX_ONLY 0x02 +# AID_MATCHING_EXACT_OR_SUBSET_OR_PREFIX 0x03 +AID_MATCHING_MODE=0x03 + +############################################################################### +#Set the default Felica T3T System Code : +#This settings will be used when application does not set this parameter +DEFAULT_SYS_CODE={FE:FE} + +############################################################################### +# Value of NIC parameter NFCC_COFNIG_CONTROL +# 0x00 NFCC is not allowed to manage RF configuration +# 0x01 NFCC is allowed to manage RF configuration +NFCC_CONFIG_CONTROL=0x01 + +############################################################################### +#Set if the AID routing should be blocked for the power modes not supported. +NFA_AID_BLOCK_ROUTE=1 + +############################################################################### +#Set the OffHost AID supported power state: +OFFHOST_AID_ROUTE_PWR_STATE=0x3B + +############################################################################### +# Mifare Tag implementation +# 0: General implementation +# 1: Legacy implementation +LEGACY_MIFARE_READER=0 + +############################################################################### +# Nfc recovery implementation +# 0: Crash Nfc Service +# 1: Toggle Nfc state +RECOVERY_OPTION=1 + +############################################################################### +# NFCEE Power Supply and Communication Link Control Configuration +# Set when SetAlwaysOn enabled +# Default 0x00 when SetAlways on disabled +ALWAYS_ON_SET_EE_POWER_AND_LINK_CONF=0x03 From 51e7f7fb3b701ad837c1c5837d6f92b5424d9832 Mon Sep 17 00:00:00 2001 From: Vincent Tew Date: Mon, 15 Nov 2021 07:31:15 +0000 Subject: [PATCH 31/57] Revert "Revert "Update: audio tuning table"" [DO NOT MERGE] This reverts commit fa1f5094d1867fe0e69affc0e720f54d93c4473d. Reason for revert: MBDRC solution merged, revert the tuning back Bug: 205934425 Change-Id: I431a1a9117d6c10416c0f94b33643480815e583b --- audio/oriole/tuning/bluenote/recording.gatf | Bin 183772 -> 184720 bytes audio/oriole/tuning/bluenote/template.xml | 4 +--- audio/raven/tuning/bluenote/recording.gatf | Bin 227712 -> 228660 bytes audio/raven/tuning/bluenote/template.xml | 4 +--- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/audio/oriole/tuning/bluenote/recording.gatf b/audio/oriole/tuning/bluenote/recording.gatf index 2667f0c7d11d5c8f1a9d9bd4606a32153f563ba0..f0160d450742344b3521ac757238b890fcf7d266 100644 GIT binary patch delta 522 zcmcaJn|s1y?xd2^yyT9HOblhIMR_a?3=E7w3=~W6;bve+ElEsQ0P>ijn>+;54gRWln{69;Ms3| zjGH1%S4w1tbfUkO}Z zdZ&4o(7ZKEg4A)8B*FdQ=xpcSvRw;SvDqU;?V<;MyLS%xJ|Zvi<)D zJ3f1neK8ZZ+AjK-zQ0F(iQVRfj4X`PH>5IF;FjL*kj}V?ak3j*01(fcZji+o03tq3 zzQ!Ifxs1b)k!|up4)e)>IHV>Y;xL=+!x_K{awQuOADLd5z^Fg@!*-7P5+Ij>VSxh! zgMuRi!v-L}a1i7?Ao~ylg8&dSFwC0S>A=9yU@x-nxE+WFi6OuOr&%*wf%-sZfWQJr z2>*l=gb!Bl0AzzOFyJ6S5J(9yFz^E@2L~WN0Fp>y*c`Qe*J>~1Q0=#);8zF p&RcU{24=*e1l0k4TtOu;{X#P13EUwy64Pb7Sry}Uvnr;jZ~%*-9L4|u diff --git a/audio/oriole/tuning/bluenote/template.xml b/audio/oriole/tuning/bluenote/template.xml index c27188e..52a75ba 100644 --- a/audio/oriole/tuning/bluenote/template.xml +++ b/audio/oriole/tuning/bluenote/template.xml @@ -234,8 +234,6 @@ - - @@ -275,7 +273,7 @@ - + diff --git a/audio/raven/tuning/bluenote/recording.gatf b/audio/raven/tuning/bluenote/recording.gatf index dba7c69edbf1b8734dba3f6aeb46d5350fff23b9..61a6f5ea87c794b447d1acadc592f025e961cd2b 100644 GIT binary patch delta 527 zcmZqp%)8|muV6`OUb0RtGecQwQ638e0|Vpq!ZJqT%{5#LR(thuGccr#n+i$ z)OK%)+2wLyJt}P7y_0`9bzhwqn-;y5Bf8Ib-u5}!sg=bXKy_enfZre`u_Vz4sGkWa z;KDsUD~B;}XP3_u!vJe0O delta 933 zcmdn;i?`u3uS-d3UUEexGecQwQ638e0|O%v1I5w? ze8cYvjqg1!x*X%>vPr+Do*^W2w(o+N-^}dP%3=+AOj#)jK$jy}KtRk5D^#*ZwFlM~ie;7?>t akVJOjwA2s^$99V - - @@ -275,7 +273,7 @@ - + From 61d459a428e6b9a6de67de1f777d310b0cc5e42c Mon Sep 17 00:00:00 2001 From: Benjamin Collins Date: Tue, 9 Nov 2021 15:29:40 +0000 Subject: [PATCH 32/57] Revert "Revert "thermal: update TPU SKIN policy"" This reverts commit 00246ff28cfbdad5bab98071e3f3ac51027668b2. Reason for revert: camera no longer broken Bug: 201155685 Change-Id: I2e21bd0daa3eb70cea2c8dae566c77d50fd7a686 --- thermal_info_config_oriole.json | 2 +- thermal_info_config_raven.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index 2c7fdc8..ef850a8 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -400,7 +400,7 @@ }, { "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 1, 2, 3, 4, 4, 4] + "LimitInfo": [0, 2, 3, 4, 5, 5, 5] } ] }, diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index c01ece3..3730e83 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -375,7 +375,7 @@ }, { "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 1, 2, 3, 4, 4, 4] + "LimitInfo": [0, 2, 3, 4, 5, 5, 5] } ] }, From ba2a4ec4588b18f59ad6d7e9fe154f3136357c28 Mon Sep 17 00:00:00 2001 From: George Lee Date: Mon, 18 Oct 2021 10:28:51 -0700 Subject: [PATCH 33/57] bcl: Enable limitation on VDROOPX and BATOILO To mitigate Synthetic load in brownout test, we need to increase UVLO1 to 3.2V, UVLO2 to 3.0V, and increase BAT_OILO deglitch time from 100us to 1ms. In addition, we must limit DVFS State whenever the interrupts are triggered. Bug: 200943374 Test: Local test Signed-off-by: George Lee Change-Id: Iaf607b48eda878fc47cb4eb85e326e2d0a8684f0 --- thermal_info_config_oriole.json | 82 +++++++++++++++++++++++++++++---- thermal_info_config_raven.json | 82 +++++++++++++++++++++++++++++---- 2 files changed, 146 insertions(+), 18 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index ef850a8..148676a 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -724,7 +724,7 @@ "Coefficient":[ "-10000", "400", - "1200" + "1000" ], "HotThreshold":[ "NAN", @@ -753,7 +753,7 @@ "Coefficient":[ "-10000", "400", - "1200" + "1000" ], "HotThreshold":[ "NAN", @@ -790,6 +790,14 @@ { "CdevRequest": "thermal-cpufreq-2", "LimitInfo": [0, 0, 0, 7, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 0, 7, 11] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 0, 4, 5] } ] }, @@ -816,7 +824,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 10, 11, 11] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"vdroop1", @@ -826,7 +848,7 @@ "NAN", "NAN", "NAN", - 1150, + 1000, "NAN", "NAN" ], @@ -841,7 +863,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"vdroop2", @@ -851,7 +887,7 @@ "NAN", "NAN", "NAN", - 1350, + 1200, "NAN", "NAN" ], @@ -866,7 +902,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 15, 15, 15] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"smpl_gm", @@ -876,7 +926,7 @@ "NAN", "NAN", "NAN", - 1400, + 1100, "NAN", "NAN" ], @@ -891,7 +941,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 13, 13, 13] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"ocp_cpu1", diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index 3730e83..db9cb5e 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -699,7 +699,7 @@ "Coefficient":[ "-10000", "400", - "1200" + "1000" ], "HotThreshold":[ "NAN", @@ -728,7 +728,7 @@ "Coefficient":[ "-10000", "400", - "1200" + "1000" ], "HotThreshold":[ "NAN", @@ -765,6 +765,14 @@ { "CdevRequest": "thermal-cpufreq-2", "LimitInfo": [0, 0, 0, 7, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 0, 7, 11] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 0, 4, 5] } ] }, @@ -791,7 +799,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 10, 11, 11] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"vdroop1", @@ -801,7 +823,7 @@ "NAN", "NAN", "NAN", - 1150, + 1000, "NAN", "NAN" ], @@ -816,7 +838,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"vdroop2", @@ -826,7 +862,7 @@ "NAN", "NAN", "NAN", - 1350, + 1200, "NAN", "NAN" ], @@ -841,7 +877,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 15, 15, 15] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"smpl_gm", @@ -851,7 +901,7 @@ "NAN", "NAN", "NAN", - 1400, + 1100, "NAN", "NAN" ], @@ -866,7 +916,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 13, 13, 13] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"ocp_cpu1", From 00d1ed2b069ddf118ff552f6ea476a8f9a369749 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Wed, 24 Nov 2021 10:48:42 +0800 Subject: [PATCH 34/57] Update SVN for O6R4 December 2021 (EMEA/AU) Bug: 207569882 Change-Id: Ied3cef713a7d7a34faea30255fb5e11e0d1deb22 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index a3744be..88cf6c9 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=8 + ro.vendor.build.svn=9 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 723844c..fd21bb2 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -145,7 +145,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=8 + ro.vendor.build.svn=9 # Hide cutout overlays PRODUCT_PACKAGES += \ From 43ce3a4014e13b67b16638899cf5008813bd773c Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Tue, 30 Nov 2021 20:53:27 +0800 Subject: [PATCH 35/57] Update SVN to 10 for O6R4 December QPR 2021 Bug: 208388283 Change-Id: I68825bf96c8b94dc63ebc096c57b9f7c680be090 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 88cf6c9..17a1d89 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=9 + ro.vendor.build.svn=10 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index fd21bb2..dcce448 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -145,7 +145,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=9 + ro.vendor.build.svn=10 # Hide cutout overlays PRODUCT_PACKAGES += \ From 586a87e5dc4648cfcdf2bec7cf5d160f062a8ba2 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Wed, 1 Dec 2021 11:54:54 +0800 Subject: [PATCH 36/57] Update SVN to 11 for O6R4 December QPR 2021 Bug: 208388283 Change-Id: I85ff3f78d4465d946cc692b69e4b7e9f916f1c78 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 17a1d89..e878187 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=10 + ro.vendor.build.svn=11 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index dcce448..a597b72 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -145,7 +145,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=10 + ro.vendor.build.svn=11 # Hide cutout overlays PRODUCT_PACKAGES += \ From f96311139f40da89cd3517b748866a1df986c059 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Wed, 1 Dec 2021 11:55:17 +0800 Subject: [PATCH 37/57] Update SVN to 12 for O6R4 December QPR 2021 Bug: 208388283 Change-Id: Iabd6c76a8bf59312239b0a58e05f2385134cdd7c --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index e878187..6f99336 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=11 + ro.vendor.build.svn=12 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index a597b72..ebd5c38 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -145,7 +145,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=11 + ro.vendor.build.svn=12 # Hide cutout overlays PRODUCT_PACKAGES += \ From 5e1a8853f761990c1f75013134f4666256d4600c Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Wed, 1 Dec 2021 11:55:42 +0800 Subject: [PATCH 38/57] Update SVN to 13 for O6R4 December QPR 2021 Bug: 208388283 Change-Id: I413a9c159fc9fde0447e3f6f24174d02a2c2dc2e --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 6f99336..0756f61 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=12 + ro.vendor.build.svn=13 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index ebd5c38..34841fb 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -145,7 +145,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=12 + ro.vendor.build.svn=13 # Hide cutout overlays PRODUCT_PACKAGES += \ From 1c954f30da01449be8b3c1e2b2dbda55c3a94f26 Mon Sep 17 00:00:00 2001 From: neoyu Date: Wed, 1 Dec 2021 20:25:48 +0800 Subject: [PATCH 39/57] Add CDMA feature XML inclusion to device mk files for oriole & raven Bug: 207398695 Test: inspect build artifacts - result is expected Change-Id: I5bc2716954263eafb33d08f2eeb2a45eba8031ba --- device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index b0240f4..23b4a82 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -60,6 +60,10 @@ PRODUCT_COPY_FILES += \ device/google/raviole/thermal_info_config_oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ device/google/raviole/thermal_info_config_oriole_WHI_A.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_WHI_A.json +# CDMA files +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.telephony.cdma.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.cdma.xml + # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true diff --git a/device-raven.mk b/device-raven.mk index 86be99e..c533190 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -68,6 +68,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/raviole/thermal_info_config_raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json +# CDMA files +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.telephony.cdma.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.cdma.xml + # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true From 43e244d7b601f37a806ea13aa84e5ea89053ba53 Mon Sep 17 00:00:00 2001 From: Hunter Knepshield Date: Thu, 2 Dec 2021 19:14:24 +0000 Subject: [PATCH 40/57] Revert "Add CDMA feature XML inclusion to device mk files for oriole & raven" This reverts commit 1c954f30da01449be8b3c1e2b2dbda55c3a94f26. Reason for revert: These devices do not support CDMA Bug: 201322462 Test: inspect build artifacts Change-Id: I73e48320088b190e047765ce12dcb3303adfd07b --- device-oriole.mk | 4 ---- device-raven.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 23b4a82..b0240f4 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -60,10 +60,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/thermal_info_config_oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ device/google/raviole/thermal_info_config_oriole_WHI_A.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_WHI_A.json -# CDMA files -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.telephony.cdma.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.cdma.xml - # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true diff --git a/device-raven.mk b/device-raven.mk index c533190..86be99e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -68,10 +68,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/raviole/thermal_info_config_raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json -# CDMA files -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.telephony.cdma.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.cdma.xml - # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true From 6c4358f966e78f4d33e36794f8eb9ca36d9fd8b2 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 3 Dec 2021 22:35:33 +0800 Subject: [PATCH 41/57] Update SVN to 14 for O6R4 Jan MPR 2022 Bug: 208388283 Change-Id: I7009fdb1a5c034700e2c0546c4b79c998033c943 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 0756f61..7a106bd 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=13 + ro.vendor.build.svn=14 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 34841fb..5b9feb8 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -145,7 +145,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=13 + ro.vendor.build.svn=14 # Hide cutout overlays PRODUCT_PACKAGES += \ From 6970a1c68cc8474548a53e4028a586f0bec7e427 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 3 Dec 2021 22:35:56 +0800 Subject: [PATCH 42/57] Update SVN to 15 for O6R4 Jan MPR 2022 Bug: 208388283 Change-Id: Ied743734f8692a5de48465d66c3e8717588519e0 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 7a106bd..14ba324 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=14 + ro.vendor.build.svn=15 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 5b9feb8..0c9c169 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -145,7 +145,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=14 + ro.vendor.build.svn=15 # Hide cutout overlays PRODUCT_PACKAGES += \ From 1c099b53437ad77a7869dd0a211f7de1fb677748 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 3 Dec 2021 22:36:12 +0800 Subject: [PATCH 43/57] Update SVN to 16 for O6R4 Jan MPR 2022 Bug: 208388283 Change-Id: I09ab2801655764a816914f553bcfa6456c86f736 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 14ba324..4e50e40 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=15 + ro.vendor.build.svn=16 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 0c9c169..9824d6f 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -145,7 +145,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=15 + ro.vendor.build.svn=16 # Hide cutout overlays PRODUCT_PACKAGES += \ From c4f2e1f8bea3c0778399443e5a03e7d25bd6fdc3 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 3 Dec 2021 22:36:32 +0800 Subject: [PATCH 44/57] Update SVN to 17 for O6R4 Feb MPR 2022 Bug: 208388283 Change-Id: Ia5caead5c49e7f8ab451276183022d097cf7cb88 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 4e50e40..8510066 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=16 + ro.vendor.build.svn=17 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 9824d6f..cb8ea01 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -145,7 +145,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=16 + ro.vendor.build.svn=17 # Hide cutout overlays PRODUCT_PACKAGES += \ From e698ad5ebf1131ac1d7661a9f6fc283c50373e12 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 3 Dec 2021 22:36:51 +0800 Subject: [PATCH 45/57] Update SVN to 18 for O6R4 Feb MPR 2022 Bug: 208388283 Change-Id: I81a32df8a136222a20d3e880d723dc09e1f6a563 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 8510066..f199321 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=17 + ro.vendor.build.svn=18 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index cb8ea01..e5d01b5 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -145,7 +145,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=17 + ro.vendor.build.svn=18 # Hide cutout overlays PRODUCT_PACKAGES += \ From b43a67872fa9b71268a8162cbd343a8f6d2918a5 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 3 Dec 2021 22:37:11 +0800 Subject: [PATCH 46/57] Update SVN to 19 for O6R4 Feb MPR 2022 Bug: 208388283 Change-Id: Iff5e995440dd90e6d4205707b17760ce955b1631 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index f199321..e50950f 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=18 + ro.vendor.build.svn=19 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index e5d01b5..c447ca7 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -145,7 +145,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=18 + ro.vendor.build.svn=19 # Hide cutout overlays PRODUCT_PACKAGES += \ From b90720c8c749c2a8a36f70814a3dbea2533f7295 Mon Sep 17 00:00:00 2001 From: Alex Hong Date: Wed, 17 Nov 2021 19:10:08 +0800 Subject: [PATCH 47/57] [DO NOT MERGE] Update PRODUCT_SHIPPING_API_LEVEL for gs101 devices Test: adb shell getprop ro.product.first_api_level Bug: 202921268 Change-Id: I3de89e705c1e7f0bac5f6d4b4b2791ef2edcfec6 Signed-off-by: Alex Hong --- device-oriole.mk | 3 +++ device-raven.mk | 3 +++ device-slider.mk | 3 +++ device-whitefin.mk | 3 +++ 4 files changed, 12 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index d7718b8..990c305 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -210,3 +210,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Set zram size PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g + +# This device is shipped with 31 (Android S) +PRODUCT_SHIPPING_API_LEVEL := 31 diff --git a/device-raven.mk b/device-raven.mk index ebf8c5f..7f2df2b 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -226,3 +226,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Set zram size PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g + +# This device is shipped with 31 (Android S) +PRODUCT_SHIPPING_API_LEVEL := 31 diff --git a/device-slider.mk b/device-slider.mk index acacaf7..26ea3a0 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -104,3 +104,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/slider # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts + +# This device is shipped with 31 (Android S) +PRODUCT_SHIPPING_API_LEVEL := 31 diff --git a/device-whitefin.mk b/device-whitefin.mk index 52e556b..1b1d5c3 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -85,3 +85,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts + +# This device is shipped with 31 (Android S) +PRODUCT_SHIPPING_API_LEVEL := 31 From dd623c582cd5dd524ec55a962f80f40c4836ff58 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Wed, 15 Dec 2021 17:53:20 +0800 Subject: [PATCH 48/57] Update SVN to 20 for O6R4 Jan respin Bug: 208388283 Change-Id: I526a00cad840ff00747918e605873ccbe939ae2f --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index e50950f..b807dd6 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=19 + ro.vendor.build.svn=20 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index c447ca7..40b4126 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -145,7 +145,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=19 + ro.vendor.build.svn=20 # Hide cutout overlays PRODUCT_PACKAGES += \ From fbe1c66488555b9d9a875eefda60af1b955de33f Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Wed, 15 Dec 2021 09:17:53 -0800 Subject: [PATCH 49/57] Use soong_config_ macros to set Soong config variables. Bug: 198503843 Test: treehugger Change-Id: Ic9d26b16bd90f4b34bc069616a273ac568e62722 --- device-oriole.mk | 4 ++-- device-raven.mk | 4 ++-- device-slider.mk | 4 ++-- device-whitefin.mk | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 990c305..d512e33 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -39,8 +39,8 @@ else include device/google/gs101/fingerprint/udfps_factory.mk endif -SOONG_CONFIG_lyric_tuning_product := oriole -SOONG_CONFIG_google3a_config_target_device := oriole +$(call soong_config_set,lyric,tuning_product,oriole) +$(call soong_config_set,google3a_config,target_device,oriole) # Init files PRODUCT_COPY_FILES += \ diff --git a/device-raven.mk b/device-raven.mk index 7f2df2b..bc5dfd0 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -45,8 +45,8 @@ endif include hardware/google/pixel/vibrator/cs40l25/device.mk -SOONG_CONFIG_lyric_tuning_product := raven -SOONG_CONFIG_google3a_config_target_device := raven +$(call soong_config_set,lyric,tuning_product,raven) +$(call soong_config_set,google3a_config,target_device,raven) PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.support_kernel_idle_timer=true PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.enable_frame_rate_override=true diff --git a/device-slider.mk b/device-slider.mk index 26ea3a0..72fa1ec 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -28,8 +28,8 @@ include device/google/gs101/device-common.mk include device/google/raviole/audio/slider/audio-tables.mk include hardware/google/pixel/vibrator/cs40l25/device.mk -SOONG_CONFIG_lyric_tuning_product := slider -SOONG_CONFIG_google3a_config_target_device := slider +$(call soong_config_set,lyric,tuning_product,slider) +$(call soong_config_set,google3a_config,target_device,slider) # WirelessCharger DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml diff --git a/device-whitefin.mk b/device-whitefin.mk index 1b1d5c3..370f885 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -28,8 +28,8 @@ include device/google/gs101/device-common.mk include hardware/google/pixel/vibrator/drv2624/device.mk include device/google/raviole/audio/whitefin/audio-tables.mk -SOONG_CONFIG_lyric_tuning_product := slider -SOONG_CONFIG_google3a_config_target_device := slider +$(call soong_config_set,lyric,tuning_product,slider) +$(call soong_config_set,google3a_config,target_device,slider) # WirelessCharger DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml From 2a05c539a71f0672a4f7da7b1991ce28c753719a Mon Sep 17 00:00:00 2001 From: linpeter Date: Wed, 17 Nov 2021 17:59:22 +0800 Subject: [PATCH 50/57] display: enable hbm sv dimming [ DO NOT MERGE ] Bug: 192919359 test: hbm sv dimming check Change-Id: Iabf9361d53ef20bf6a761b73444ecb7c82bbd903 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 7f2df2b..fa1d053 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -101,7 +101,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/raven/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb #config of display brightness dimming -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.brightness.dimming.usage=2 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.brightness.dimming.usage=1 # NFC PRODUCT_COPY_FILES += \ From 1ee32ca9ed9b01fdd04b7cc8d7bd75f1e7731549 Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Wed, 15 Dec 2021 16:14:44 -0800 Subject: [PATCH 51/57] DO NOT MERGE Remove unintended faceauth configs Bug: 210921116 Test: N/A Change-Id: Ie10aaca6892b1246b57941d00b283f202b08035d --- conf/init.raven.rc | 4 ---- raven/overlay/frameworks/base/core/res/res/values/config.xml | 3 --- 2 files changed, 7 deletions(-) diff --git a/conf/init.raven.rc b/conf/init.raven.rc index af9fbfc..4d5d2a9 100644 --- a/conf/init.raven.rc +++ b/conf/init.raven.rc @@ -11,10 +11,6 @@ on init # Power Stats HAL chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats -on fs - # Face - exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app - on property:vendor.mfgapi.touchpanel.permission=1 chmod 0600 /sys/devices/virtual/sec/tsp/cmd chown system system /sys/devices/virtual/sec/tsp/cmd diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index c68e625..7da850b 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -200,9 +200,6 @@ --> 28dp - - false - 64 From f757d485d45a0a9f93986c26ac4a697adbb8e38e Mon Sep 17 00:00:00 2001 From: "Harpreet \"Eli\" Sangha" Date: Tue, 21 Dec 2021 02:33:33 +0000 Subject: [PATCH 52/57] Revert "Move dck.eligible_wcc back to 3 for R4" This reverts commit 67cccb2750f90560ff4b086c855161bcbe3159b9. Reason for revert: b/210746264 Change-Id: I19da43552eb21a35816289838872636743e77602 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index fa1d053..3f14733 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -200,7 +200,7 @@ PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_l=11 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=3 + ro.gms.dck.eligible_wcc=2 # SKU specific RROs PRODUCT_PACKAGES += \ From b26e78c62120bd70c2f25fbe150749d63a0e7d14 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 6 Jan 2022 23:16:16 +0800 Subject: [PATCH 53/57] thermal: adjust Raven USB-C throttling threshold According to the survey result, R4 has less margin than O6, so adjust the threshold to reduce the false positive rate. Bug: 213400531 Test: verified by emul_temp Change-Id: Iaea41fb62a4e2e06f59d40c26cfde563143fc07e --- thermal_info_config_raven.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index db9cb5e..9b696c2 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -141,7 +141,7 @@ "Type":"UNKNOWN", "HotThreshold":[ "NAN", - "35.0", + "40.0", "NAN", "NAN", "NAN", @@ -554,8 +554,8 @@ "USB2-MINUS-QI" ], "Coefficient":[ - "35000", - "3000", + "40000", + "4500", "9000" ], "HotThreshold":[ From d0104cfd0d5a81d2bec523892c4fd43dbe926e86 Mon Sep 17 00:00:00 2001 From: vincenttew Date: Tue, 4 Jan 2022 21:20:33 +0800 Subject: [PATCH 54/57] audio: syncing the USB config for mfg currently mfg audio tool using audio-recordC usb-headset-mic in mixer_paths.xml, add a new path for mfg usb recording to switching the usb mic source modify the usb alsa control to v2 since the latest alsa control already changed Bug: 213027646 Test: verify pass with mfg tool usb-record Signed-off-by: vincenttew Change-Id: If3af632ed2bddcdd1329f17fc89ea82162d810ae --- audio/oriole/config/mixer_paths_factory.xml | 27 ++++++++++++++++----- audio/raven/config/mixer_paths_factory.xml | 27 ++++++++++++++++----- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/audio/oriole/config/mixer_paths_factory.xml b/audio/oriole/config/mixer_paths_factory.xml index 57633f5..3326db7 100644 --- a/audio/oriole/config/mixer_paths_factory.xml +++ b/audio/oriole/config/mixer_paths_factory.xml @@ -36,6 +36,14 @@ + + + + + + + + @@ -233,12 +241,13 @@ - - - - - - + + + + + + + @@ -300,9 +309,15 @@ + + + + + + diff --git a/audio/raven/config/mixer_paths_factory.xml b/audio/raven/config/mixer_paths_factory.xml index 57633f5..3326db7 100644 --- a/audio/raven/config/mixer_paths_factory.xml +++ b/audio/raven/config/mixer_paths_factory.xml @@ -36,6 +36,14 @@ + + + + + + + + @@ -233,12 +241,13 @@ - - - - - - + + + + + + + @@ -300,9 +309,15 @@ + + + + + + From 973e42a5fd839d31775667a0ab529d48c6d32b85 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Mon, 10 Jan 2022 18:18:54 +0800 Subject: [PATCH 55/57] thermal: adjust Raven USB-C UI warning threshold According to the survey result, R4 has less margin than O6, so adjust the threshold to reduce the false positive rate. Bug: 213400531 Test: verified by emul_temp Change-Id: I6ed9168a43d9936aef68ce60fb480af161eeb588 --- thermal_info_config_raven.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index 9b696c2..9c9db8d 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -590,8 +590,8 @@ "USB2-MINUS-QI" ], "Coefficient":[ - "35000", - "4000", + "40000", + "5000", "12000" ], "HotThreshold":[ From aa73129ab37a1c4f14096d24a35e171e3d3cfd0b Mon Sep 17 00:00:00 2001 From: Lais Andrade Date: Fri, 7 Jan 2022 17:09:27 +0000 Subject: [PATCH 56/57] Add PWLE notification vibration patterns for P21 devices Add the PWLE vibration pattern to the config.xml overlays for Pixel 2021 devices that support frequency control. The patterns use the amplitude and frequency hand-designed for both raven and oriole devices. The amplitude is using the maximum supported value of 0.4, to allow scaling based on user settings. Bug: 212366218 Test: manual Change-Id: I73a2f3e50901b80aef299f4c8e9807a551170bbc Merged-In: I73a2f3e50901b80aef299f4c8e9807a551170bbc --- .../base/core/res/res/values/config.xml | 82 +++++++++++++++++++ .../base/core/res/res/values/config.xml | 82 +++++++++++++++++++ 2 files changed, 164 insertions(+) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index f2bc440..cf57ec0 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -227,6 +227,88 @@ non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. --> 50 + + + 0.0 + -0.85 + 0.0 + + 0.4 + -0.25 + 100.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 100.0 + + 0.0 + -0.85 + 100.0 + + 0.4 + -0.25 + 100.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 100.0 + + + + + 0.0 + -0.85 + 0.0 + + 0.4 + -0.25 + 50.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 50.0 + + 0.0 + -0.85 + 100.0 + + 0.4 + -0.25 + 50.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 50.0 + + 64 diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 7da850b..491a4cc 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -195,6 +195,88 @@ non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. --> 50 + + + 0.0 + -0.85 + 0.0 + + 0.4 + -0.25 + 100.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 100.0 + + 0.0 + -0.85 + 100.0 + + 0.4 + -0.25 + 100.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 100.0 + + + + + 0.0 + -0.85 + 0.0 + + 0.4 + -0.25 + 50.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 50.0 + + 0.0 + -0.85 + 100.0 + + 0.4 + -0.25 + 50.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 50.0 + + From db13b85d51e5b6c5327423e04401affa801d0cb1 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Fri, 7 Jan 2022 16:03:00 -0800 Subject: [PATCH 57/57] Inline usages of LOCAL_STEM Having no variables in include/inherit-product statements makes the conversion to starlark cleaner. Bug: 211659921 Test: Presubmits Change-Id: Icf9126f27d81486847d07224a49f92c19e4a49d5 --- self-extractors_oriole/root/proprietary/BoardConfigVendor.mk | 4 +--- self-extractors_oriole/root/proprietary/device-vendor.mk | 4 +--- self-extractors_raven/root/proprietary/BoardConfigVendor.mk | 4 +--- self-extractors_raven/root/proprietary/device-vendor.mk | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk b/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk index fa00b92..a632ec4 100644 --- a/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk +++ b/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := oriole/BoardConfigPartial.mk - --include vendor/google_devices/$(LOCAL_STEM) +-include vendor/google_devices/oriole/BoardConfigPartial.mk diff --git a/self-extractors_oriole/root/proprietary/device-vendor.mk b/self-extractors_oriole/root/proprietary/device-vendor.mk index aa3ae50..2c4443b 100644 --- a/self-extractors_oriole/root/proprietary/device-vendor.mk +++ b/self-extractors_oriole/root/proprietary/device-vendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := oriole/device-partial.mk - -$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/google_devices/oriole/BoardConfigPartial.mk) diff --git a/self-extractors_raven/root/proprietary/BoardConfigVendor.mk b/self-extractors_raven/root/proprietary/BoardConfigVendor.mk index 25a880e..6e788fc 100644 --- a/self-extractors_raven/root/proprietary/BoardConfigVendor.mk +++ b/self-extractors_raven/root/proprietary/BoardConfigVendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := raven/BoardConfigPartial.mk - --include vendor/google_devices/$(LOCAL_STEM) +-include vendor/google_devices/raven/BoardConfigPartial.mk diff --git a/self-extractors_raven/root/proprietary/device-vendor.mk b/self-extractors_raven/root/proprietary/device-vendor.mk index 4877f39..2be1993 100644 --- a/self-extractors_raven/root/proprietary/device-vendor.mk +++ b/self-extractors_raven/root/proprietary/device-vendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := raven/device-partial.mk - -$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/google_devices/raven/device-partial.mk)