From a474241af463c83d61f51c86ff024091624dd0c9 Mon Sep 17 00:00:00 2001 From: Joe Huang Date: Fri, 5 Aug 2022 13:28:46 +0800 Subject: [PATCH 1/2] Remove carrier location permission backdoor - Affected device: M23 Test: Build test and check Carrier Location App is not installed Bug: 241503733 Change-Id: I9c7ec92bb994530566980e06e0712b1e76474d82 --- location/gps.xml.f10 | 2 -- location/gps_user.xml.f10 | 2 -- 2 files changed, 4 deletions(-) diff --git a/location/gps.xml.f10 b/location/gps.xml.f10 index 2a815b3..8a0364d 100644 --- a/location/gps.xml.f10 +++ b/location/gps.xml.f10 @@ -53,8 +53,6 @@ CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" - AttributionAppPkgName="com.google.android.carrierlocation" - AssertEnabled="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" diff --git a/location/gps_user.xml.f10 b/location/gps_user.xml.f10 index 02aadea..1ed236a 100644 --- a/location/gps_user.xml.f10 +++ b/location/gps_user.xml.f10 @@ -52,8 +52,6 @@ CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" - AttributionAppPkgName="com.google.android.carrierlocation" - AssertEnabled="false" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" From e9d5e019805d123a1033bbd4c025de16fd334953 Mon Sep 17 00:00:00 2001 From: achigoliu Date: Thu, 4 Aug 2022 18:45:24 +0800 Subject: [PATCH 2/2] Bundle handheld_core_hardware.xml Bug: 237110906 Test: Manual, verify build artifacts Signed-off-by: achigoliu Change-Id: I40d8e00d90cb733dc03064556894e89dbd38a5af Merged-In: Ie89503e9983eee55b1ae6f03a24cd51d58080772 --- device-felix.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-felix.mk b/device-felix.mk index c5fab12..4f42b7e 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -237,3 +237,7 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += device/google/felix DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/felix/device_framework_matrix_product_felix.xml + +# Device features +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml