oriole: include factory/shipping UDFPS based on target
This CL transitions the regular build to the AIDL fingerprint HAL, while
keeping the factory build on HIDL.
AuthService reports "Registering HIDL ID: 0 Modality: 2 Strength: 15"
only for the factory build.
Bug: 188193467
Test: build oriole-userdebug
Test: build factory_oriole-userdebug
Test: adb logcat | grep AuthService
Change-Id: I2c10239b93f9c8025607643385304b16f24f5dc6
diff --git a/device-oriole.mk b/device-oriole.mk
index 233008b..9dd60c2 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -26,10 +26,17 @@
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay
include device/google/gs101/device-shipping-common.mk
-include device/google/gs101/fingerprint/udfps.mk
+include device/google/gs101/fingerprint/udfps_common.mk
include device/google/raviole/audio/oriole/audio-tables.mk
include hardware/google/pixel/vibrator/cs40l25/device.mk
+ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),)
+include device/google/gs101/fingerprint/udfps_shipping.mk
+else
+include device/google/gs101/fingerprint/udfps_factory.mk
+endif
+
+
# Init files
PRODUCT_COPY_FILES += \
device/google/raviole/conf/init.raviole.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.raviole.rc \
diff --git a/factory_oriole.mk b/factory_oriole.mk
index cbd0ae0..754fc26 100644
--- a/factory_oriole.mk
+++ b/factory_oriole.mk
@@ -24,12 +24,11 @@
PRODUCT_BRAND := Android
PRODUCT_MANUFACTURER := Google
+DEVICE_PACKAGE_OVERLAYS += device/google/raviole/factory_oriole/overlay
+
# default BDADDR for EVB only
PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
-# Fingerprint
-include device/google/gs101/fingerprint/udfps_factory.mk
-
# Factory binary of camera
PRODUCT_PACKAGES += fatp_gn1_hat_tool
diff --git a/factory_oriole/overlay/frameworks/base/core/res/res/values/config.xml b/factory_oriole/overlay/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..a0aae7d
--- /dev/null
+++ b/factory_oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
+ when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
+ where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
+ and Strength as defined in Authenticators.java -->
+ <string-array name="config_biometric_sensors" translatable="false" >
+ <item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
+ </string-array>
+
+ <!-- The properties of a UDFPS sensor in pixels -->
+ <integer-array name="config_udfps_sensor_props">
+ <item>540</item> <!-- sensorLocationX -->
+ <item>1769</item> <!-- sensorLocationY -->
+ <item>113</item> <!-- sensorRadius -->
+ </integer-array>
+
+</resources>
diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index 8194bb4..569a927 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -58,14 +58,6 @@
<!-- y-intercept --> <item>1.0</item>
</string-array>
- <!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
- when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
- where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
- and Strength as defined in Authenticators.java -->
- <string-array name="config_biometric_sensors" translatable="false" >
- <item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
- </string-array>
-
<!-- Whether the display cutout region of the main built-in display should be forced to
black in software (to avoid aliasing or emulate a cutout that is not physically existent).
-->
@@ -169,13 +161,6 @@
<item>900.0</item> <!-- 20000+ -->
</array>
- <!-- The properties of a UDFPS sensor in pixels -->
- <integer-array name="config_udfps_sensor_props">
- <item>540</item> <!-- sensorLocationX -->
- <item>1769</item> <!-- sensorLocationY -->
- <item>113</item> <!-- sensorRadius -->
- </integer-array>
-
<!-- Type of the udfps long press sensor. Empty if long press is not supported. -->
<string name="config_dozeUdfpsLongPressSensorType" translatable="false">com.google.sensor.long_press</string>