From fa5074a487c8c1155a4e85290259934e015f8379 Mon Sep 17 00:00:00 2001 From: Eran Messeri Date: Tue, 27 Mar 2018 19:36:19 +0100 Subject: [PATCH 1/2] Indicate Taimen support Device ID attestation. Bug: 72642093 Bug: 73448533 Test: Modified CTS tests Change-Id: Ie6e26e1cde696fa5dea9e149102437525a39290d --- device.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device.mk b/device.mk index 1ccdda7..cffb431 100644 --- a/device.mk +++ b/device.mk @@ -99,6 +99,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/taimen/touchscreen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/touchscreen.idc +# Keymaster configuration +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 + # Enable modem logging ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PROPERTY_OVERRIDES += \ From b356d7f4e30c7651f6a0df4ed23f5271210672de Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Wed, 4 Apr 2018 17:27:54 +0200 Subject: [PATCH 2/2] Enable early phase offsets for Taimen Since we hit GL comp quite frequently during app transitions, we need to enable early phase offsets to give it enough time for composition. Test: Open app, make sure vsync-offsets shift Bug: 75985430 Change-Id: I2f85bf72a4b135dce664f7274848f3956a9aaf7a --- device.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device.mk b/device.mk index cffb431..30cd3dd 100644 --- a/device.mk +++ b/device.mk @@ -126,3 +126,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ persist.traced.enable=1 +# Early phase offset for SurfaceFlinger (b/75985430) +PRODUCT_PROPERTY_OVERRIDES += \ + debug.sf.early_phase_offset_ns=5000000 +