From 193c85c4efd2dfbb98ca2d27d9ed44a0b2ff50c0 Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Tue, 19 Oct 2021 14:20:12 -0700 Subject: [PATCH 1/3] move uwb feature to system_ext this prevents the gsi device from starting uwb Bug: 203052451 Test: nearby-share on uwb device Signed-off-by: Victor Liu Change-Id: Iec21b82dfd79849b2d949f696e59d64f0487edad --- uwb/uwb.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uwb/uwb.mk b/uwb/uwb.mk index be2f6d24..a89cc76d 100644 --- a/uwb/uwb.mk +++ b/uwb/uwb.mk @@ -17,4 +17,4 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk) PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.uwb.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.uwb.xml + frameworks/native/data/etc/android.hardware.uwb.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/android.hardware.uwb.xml From a7f4ef05b52f611e89b2966a9c744866118f3b94 Mon Sep 17 00:00:00 2001 From: Michael Ayoubi Date: Fri, 17 Sep 2021 01:53:00 +0000 Subject: [PATCH 2/3] Add SE State Changed Intents in EuiccSupportPixel Needed to emit SE_STATE_CHANGED from Thales updater code to clients when eOS or applets are being updated. Current clients are GMSCore and UWB Service. Bug: 189881206 Bug: 183606657 Test: Confirm overlay worked and intents were received. Change-Id: Ia1106d6fad20797e72c49cfc1f790289d0da0963 --- .../EuiccSupportPixelOverlay/Android.bp | 18 +++++++++ .../AndroidManifest.xml | 26 +++++++++++++ .../res/values/config.xml | 37 +++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 rro_overlays/EuiccSupportPixelOverlay/Android.bp create mode 100644 rro_overlays/EuiccSupportPixelOverlay/AndroidManifest.xml create mode 100644 rro_overlays/EuiccSupportPixelOverlay/res/values/config.xml diff --git a/rro_overlays/EuiccSupportPixelOverlay/Android.bp b/rro_overlays/EuiccSupportPixelOverlay/Android.bp new file mode 100644 index 00000000..cb914787 --- /dev/null +++ b/rro_overlays/EuiccSupportPixelOverlay/Android.bp @@ -0,0 +1,18 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: [ + "//device/google/gs101:device_google_gs101_license", + ], +} + +runtime_resource_overlay { + name: "EuiccSupportPixelOverlay", + theme: "EuiccSupportPixelOverlay", + certificate: "platform", + sdk_version: "current", + product_specific: true +} diff --git a/rro_overlays/EuiccSupportPixelOverlay/AndroidManifest.xml b/rro_overlays/EuiccSupportPixelOverlay/AndroidManifest.xml new file mode 100644 index 00000000..d2b261ad --- /dev/null +++ b/rro_overlays/EuiccSupportPixelOverlay/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/rro_overlays/EuiccSupportPixelOverlay/res/values/config.xml b/rro_overlays/EuiccSupportPixelOverlay/res/values/config.xml new file mode 100644 index 00000000..814367fe --- /dev/null +++ b/rro_overlays/EuiccSupportPixelOverlay/res/values/config.xml @@ -0,0 +1,37 @@ + + + + + + intent:#Intent;action=com.google.android.gms.dck.action.SE_STATE_CHANGED;i.com.google.android.gms.dck.extra.SE_STATE=0;end + intent:#Intent;action=com.qorvo.uwb.action.SE_STATE_CHANGED;i.com.qorvo.uwb.extra.SE_STATE=0;end + + + intent:#Intent;action=com.google.android.gms.dck.action.SE_STATE_CHANGED;i.com.google.android.gms.dck.extra.SE_STATE=1;end + intent:#Intent;action=com.qorvo.uwb.action.SE_STATE_CHANGED;i.com.qorvo.uwb.extra.SE_STATE=1;end + + + intent:#Intent;action=com.google.android.gms.dck.action.SE_STATE_REQUEST;end + intent:#Intent;action=com.qorvo.action.SE_STATE_REQUEST;end + + + com.google.android.gms.dck.permission.DIGITAL_KEY_PRIVILEGED + com.qorvo.uwb.permission.SE_STATE_REQUEST + + From 406cc9807717d676f422e195db8243335e2d52b1 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 19 Oct 2021 17:51:41 +0900 Subject: [PATCH 3/3] Remove ndk_platform backend. Use the ndk backend. The ndk_platform backend will soon be deprecated because the ndk backend can serve the same purpose. This is to eliminate the confusion about having two variants (ndk and ndk_platform) for the same ndk backend. The prebuilt files had a reference to android.hardware.gnss-V1-ndk_platform.so. Change it to android.hardware.gnss-V1-ndk.so by diretly editing the DT_NEEDED entry. Bug: 161456198 Test: m Change-Id: I25ec19101c408cc29df38d127f284c7085fe1d1a --- .../android.hardware.gnss@2.1-impl-google.so | Bin 376320 -> 376320 bytes .../android.hardware.gnss@2.1-service-brcm | Bin 11832 -> 11832 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so b/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so index 393cc91cdf4218274536fc69365e5ed521f0a712..7e58f178d45e80782c61de0476a55fc6aa9c3e9a 100755 GIT binary patch delta 44 ocmZqpBh~;!EsR^3VwiaJit`y@pgn_$35c12m}Pqg6YGrK03DGFuK)l5 delta 44 vcmZqpBh~;!EsR^3Vwia13vv=m((;RP^@{V`Gnklwm>Gy!wr4Q0&e#nAb)XM( diff --git a/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm b/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm index 3505d27c77644e55f3ec1e1e55642d01850a3c4b..46cf216debd2778ef0eec0980368bd36222be5c8 100755 GIT binary patch delta 25 acmdlHvm<7MGdqu7aXteKZ1!h=sRjUFu?ANF delta 25 gcmdlHvm<7MGdoXwK~7>xT7FTkUUB|rfA*JZ0EWy88vp