Snap for 8567972 from 68e510f94a to tm-qpr1-release

Change-Id: If4970074d48b6683d76c8e638712cc69f2c68c26
This commit is contained in:
Android Build Coastguard Worker 2022-05-11 03:01:09 +00:00
commit 1cf7755206
2 changed files with 6 additions and 0 deletions

View file

@ -77,7 +77,9 @@
<permission name="android.permission.READ_CALL_LOG" fixed="false"/> <permission name="android.permission.READ_CALL_LOG" fixed="false"/>
<permission name="android.permission.WRITE_CALL_LOG" fixed="false"/> <permission name="android.permission.WRITE_CALL_LOG" fixed="false"/>
<!-- Used to set up a Wi-Fi P2P network --> <!-- 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.ACCESS_FINE_LOCATION" fixed="false"/>
<permission name="android.permission.NEARBY_WIFI_DEVICES" fixed="false"/>
<!-- Notifications --> <!-- Notifications -->
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/> <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
</exception> </exception>

View file

@ -1109,6 +1109,10 @@ PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer
# It must be split into the FCM of each partition. # It must be split into the FCM of each partition.
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE := device/google/gs201/device_framework_matrix_product.xml DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE := device/google/gs201/device_framework_matrix_product.xml
# Preopt SystemUI
PRODUCT_DEXPREOPT_SPEED_APPS += \
SystemUIGoogle
# Keymint configuration # Keymint configuration
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \ frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \