Merge "redbull: Replace NFC app with NFC apex" into main
diff --git a/default-permissions.xml b/default-permissions.xml
index 01daecd..e792f5c 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -60,8 +60,6 @@
<permission name="android.permission.READ_CALL_LOG" fixed="false"/>
<permission name="android.permission.WRITE_CALL_LOG" fixed="false"/>
<!-- Used to set up a Wi-Fi P2P network -->
- <!-- TODO(b/231966826): Remove the location permission after Restore targets to T. -->
- <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
<permission name="android.permission.NEARBY_WIFI_DEVICES" fixed="false"/>
<!-- Notifications -->
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
@@ -83,6 +81,8 @@
<!-- Location -->
<permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
<permission name="android.permission.ACCESS_BACKGROUND_LOCATION" fixed="false"/>
+ <!-- Battery Widget -->
+ <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
</exception>
<exception package="com.google.android.apps.camera.services">
diff --git a/device-common.mk b/device-common.mk
index 50f8e6a..2758069 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -29,6 +29,7 @@
hardware/google/pixel \
device/google/redbull \
hardware/qcom/sm7250 \
+ system/chre/host/hal_generic \
vendor/google/airbrush/floral \
vendor/google/biometrics/face/florence \
vendor/google/darwinn \
@@ -82,7 +83,8 @@
device/google/redbull/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \
device/google/redbull/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \
- frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml
+ frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml \
+ frameworks/native/data/etc/android.software.ipsec_tunnel_migration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnel_migration.xml
# Enforce privapp-permissions whitelist
PRODUCT_PROPERTY_OVERRIDES += \
@@ -101,7 +103,6 @@
PRODUCT_CHARACTERISTICS := nosdcard
PRODUCT_SHIPPING_API_LEVEL := 30
BOARD_SHIPPING_API_LEVEL := 30
-BOARD_API_LEVEL := 33
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
@@ -430,7 +431,7 @@
# DRM HAL
PRODUCT_PACKAGES += \
android.hardware.drm-service.clearkey \
- android.hardware.drm-service.widevine
+ android.hardware.drm-service.widevine-v17
# NFC and Secure Element packages
PRODUCT_PACKAGES += \
@@ -557,7 +558,7 @@
# Wifi
PRODUCT_PACKAGES += \
- android.hardware.wifi@1.0-service \
+ android.hardware.wifi-service \
wificond \
libwpa_client \
WifiOverlay
@@ -844,7 +845,7 @@
# Increment the SVN for any official public releases
ifeq ($(PRODUCT_DEVICE_SVN_OVERRIDE),)
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=68
+ ro.vendor.build.svn=74
endif
# Enable iwlan service logging for debug
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 607ca96..2401dd7 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -220,9 +220,9 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="true">
+ <hal format="aidl" optional="true">
<name>vendor.google.wifi_ext</name>
- <version>1.3</version>
+ <version>1</version>
<interface>
<name>IWifiExt</name>
<instance>default</instance>
diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml
index d143855..80efc85 100644
--- a/media_codecs_performance_c2.xml
+++ b/media_codecs_performance_c2.xml
@@ -176,6 +176,12 @@
<Limit name="measured-frame-rate-480x360" range="501-752" />
<Limit name="measured-frame-rate-1280x720" range="189-284" />
</MediaCodec>
+ <MediaCodec name="c2.android.av1.decoder" type="video/av01" update="true">
+ <Limit name="measured-frame-rate-352x288" range="323-351" />
+ <Limit name="measured-frame-rate-640x360" range="180-185" />
+ <Limit name="measured-frame-rate-720x480" range="113-114" />
+ <Limit name="measured-frame-rate-1280x720" range="54-54" />
+ </MediaCodec>
</Decoders>
<Encoders>
@@ -251,5 +257,13 @@
<!-- measured 95%:16-26 med:20/20 N=32 -->
<Limit name="measured-frame-rate-1280x720" range="20-20" /> <!-- v95%=1.3 -->
</MediaCodec>
+ <MediaCodec name="c2.android.av1.encoder" type="video/av01" update="true">
+ <!-- measured 90%:225-240 med:237 N=4 -->
+ <Limit name="measured-frame-rate-320x240" range="232-232" /> <!-- v90%=1.0 -->
+ <!-- measured 90%:52-59 med:58 N=4 -->
+ <Limit name="measured-frame-rate-720x480" range="56-56" /> <!-- v90%=1.1 -->
+ <!-- measured 90%:21-26 med:25 N=4 -->
+ <Limit name="measured-frame-rate-1280x720" range="23-23" /> <!-- v90%=1.1 -->
+ </MediaCodec>
</Encoders>
</MediaCodecs>
diff --git a/overlay/packages/apps/Settings/res/raw/face_enroll_introduction_animation.mp4 b/overlay/packages/apps/Settings/res/raw/face_enroll_introduction_animation.mp4
deleted file mode 100644
index 03aea2f..0000000
--- a/overlay/packages/apps/Settings/res/raw/face_enroll_introduction_animation.mp4
+++ /dev/null
Binary files differ
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 22b493a..2ef0bef 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -52,7 +52,7 @@
const struct UeventListener::UeventPaths ueventPaths = {
.AudioUevent = "/kernel/q6audio/q6voice_uevent",
- .WirelessChargerPtmcUevent = "POWER_SUPPLY_PTMC_ID="};
+};
int main() {
LOG(INFO) << "starting PixelStats";
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 0f22649..a15e0ba 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -52,7 +52,7 @@
<!-- True if the firmware supports connected MAC randomization -->
<bool name="config_wifi_connected_mac_randomization_supported">true</bool>
-
+ <bool name="config_wifiAllowNonPersistentMacRandomizationOnOpenSsids">true</bool>
<!-- True if the firmware supports p2p MAC randomization -->
<bool name="config_wifi_p2p_mac_randomization_supported">true</bool>
