Merge "Migrate Test Targets to New Android Ownership Model" into main
diff --git a/barbet/BoardConfig.mk b/barbet/BoardConfig.mk
index b0b4108..16c62a2 100644
--- a/barbet/BoardConfig.mk
+++ b/barbet/BoardConfig.mk
@@ -24,6 +24,9 @@
# Allow LZ4 compression
BOARD_RAMDISK_USE_LZ4 := true
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_BARBET_RADIO_DIR)
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_BARBET_BOOTLOADER_DIR)
+
# Testing related defines
#BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/b9-setup.sh
diff --git a/barbet/overlay/frameworks/base/core/res/res/values/config.xml b/barbet/overlay/frameworks/base/core/res/res/values/config.xml
index 847cefc..38efbf9 100755
--- a/barbet/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/barbet/overlay/frameworks/base/core/res/res/values/config.xml
@@ -260,4 +260,13 @@
Note: If the display supports multiple resolutions, please define the path config based on
the highest resolution so that it can be scaled correctly in each resolution. -->
<string name="config_mainDisplayShape">M 136 0 C 121.00003 0.21999956 105.99997 0.44023694 91 1.7402344 C 84.400014 2.3402332 75.99999 3.470002 71 4.5 C 51.00004 8.7999914 41.299974 14.000415 28 26.400391 C 13.550028 40.000363 6.8606979 60.000727 4.2207031 71.720703 C 2.8007059 78.000691 1.5503894 89.000028 0.90039062 103 C 0.49039144 111.99998 0.28999942 121.00003 0 136 L 0 2264 C -1.1842367e-15 2273.9802 0.89749539 2301.0762 8.4824219 2323.8809 C 9.5902204 2327.6834 10.887527 2331.427 12.394531 2335.0898 C 13.901538 2338.7425 15.479265 2342.0646 17.625 2345.877 C 21.916472 2353.5017 27.335328 2360.6789 33.632812 2366.9863 C 39.940278 2373.2838 47.117339 2378.7026 54.742188 2382.9941 C 55.151374 2383.2236 55.559563 2383.4524 55.96875 2383.6719 C 68.034771 2390.2389 81.439144 2394.0226 95.082031 2396.1484 C 111.66907 2398.7033 116.03967 2398.8024 136 2400 L 944 2400 C 963.96033 2398.8024 968.33094 2398.7033 984.91797 2396.1484 C 998.56087 2394.0226 1011.9654 2390.2389 1024.0312 2383.6719 C 1024.4404 2383.4524 1024.8486 2383.2236 1025.2578 2382.9941 C 1032.8826 2378.7026 1040.0597 2373.2838 1046.3672 2366.9863 C 1052.6647 2360.6789 1058.0835 2353.5017 1062.375 2345.877 C 1064.5207 2342.0646 1066.0985 2338.7425 1067.6055 2335.0898 C 1069.1125 2331.427 1070.4098 2327.6834 1071.5176 2323.8809 C 1079.1026 2301.0762 1080 2273.9802 1080 2264 L 1080 136 C 1079.71 121.00003 1079.5096 111.99998 1079.0996 103 C 1078.4496 89.000029 1077.1993 78.000691 1075.7793 71.720703 C 1073.1393 60.000727 1066.45 40.000363 1052 26.400391 C 1038.7 14.00042 1029 8.7999914 1009 4.5 C 1004 3.470002 995.59998 2.3402332 989 1.7402344 C 974.00002 0.44023694 958.99998 0.21999956 944 0 L 136 0 z M 1080 2264 L 1079.7305 2400 L 1080 2400 L 1080 2264 z M 0 2264 L 0 2400 L 0.26953125 2400 L 0 2264 z</string>
+
+ <!-- Pre-scale volume at volume step 1 for Absolute Volume -->
+ <fraction name="config_prescaleAbsoluteVolume_index1">100%</fraction>
+
+ <!-- Pre-scale volume at volume step 2 for Absolute Volume -->
+ <fraction name="config_prescaleAbsoluteVolume_index2">100%</fraction>
+
+ <!-- Pre-scale volume at volume step 3 for Absolute Volume -->
+ <fraction name="config_prescaleAbsoluteVolume_index3">100%</fraction>
</resources>
diff --git a/device-barbet.mk b/device-barbet.mk
index 1342413..5a426d7 100644
--- a/device-barbet.mk
+++ b/device-barbet.mk
@@ -38,7 +38,7 @@
# Increment the SVN for any official public releases
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=50
+ ro.vendor.build.svn=52
# Enable watchdog timeout loop breaker.
PRODUCT_PROPERTY_OVERRIDES += \
@@ -181,6 +181,12 @@
# Fingerprint HIDL
include device/google/barbet/fingerprint.mk
+# SurfaceFlinger configurations
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_display_power_timer_ms=1000
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=0
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_touch_timer_ms=200
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_content_detection_for_refresh_rate=true
+
# NFC
PRODUCT_COPY_FILES += \
device/google/barbet/nfc/libnfc-hal-st-G4S1M.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st-G4S1M.conf
diff --git a/self-extractors/Android.mk b/self-extractors/Android.mk
deleted file mode 100644
index e69de29..0000000
--- a/self-extractors/Android.mk
+++ /dev/null
diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk.template
similarity index 100%
rename from self-extractors/google_devices/staging/Android.mk
rename to self-extractors/google_devices/staging/Android.mk.template
diff --git a/self-extractors/qcom/staging/Android.mk b/self-extractors/qcom/staging/Android.mk.template
similarity index 100%
rename from self-extractors/qcom/staging/Android.mk
rename to self-extractors/qcom/staging/Android.mk.template
diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp
index 61cd07e..f0e9543 100644
--- a/usb/usb/Android.bp
+++ b/usb/usb/Android.bp
@@ -38,7 +38,7 @@
"android.hardware.usb.gadget@1.0",
"android.hardware.usb-V1-ndk",
"libcutils",
- "android.frameworks.stats-V1-ndk",
+ "android.frameworks.stats-V2-ndk",
"pixelatoms-cpp",
"libbinder_ndk",
@@ -48,7 +48,7 @@
"libpixelstats",
],
export_shared_lib_headers: [
- "android.frameworks.stats-V1-ndk",
+ "android.frameworks.stats-V2-ndk",
"pixelatoms-cpp",
],
}
