From ae629afa8ca3d0eaa86081431ade1cfa095d5f59 Mon Sep 17 00:00:00 2001 From: Sebastiano Barezzi Date: Sat, 30 Apr 2022 23:06:03 +0200 Subject: [PATCH] hidl: biometrics: fingerprint: Rebrand to Nothing Change-Id: Icd5dfab05ca571ef36e8b2b1ce1bad9239877282 --- hidl/biometrics/fingerprint/Android.bp | 10 +++++----- hidl/biometrics/fingerprint/BiometricsFingerprint.cpp | 4 ++-- ...ware.biometrics.fingerprint@2.1-service.nothing.rc} | 2 +- ...are.biometrics.fingerprint@2.1-service.nothing.xml} | 0 hidl/biometrics/fingerprint/service.cpp | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) rename hidl/biometrics/fingerprint/{android.hardware.biometrics.fingerprint@2.1-service.rc => android.hardware.biometrics.fingerprint@2.1-service.nothing.rc} (91%) rename hidl/biometrics/fingerprint/{android.hardware.biometrics.fingerprint@2.1-service.xml => android.hardware.biometrics.fingerprint@2.1-service.nothing.xml} (100%) diff --git a/hidl/biometrics/fingerprint/Android.bp b/hidl/biometrics/fingerprint/Android.bp index b258cf3..db48fca 100644 --- a/hidl/biometrics/fingerprint/Android.bp +++ b/hidl/biometrics/fingerprint/Android.bp @@ -8,10 +8,10 @@ package { } cc_binary { - name: "android.hardware.biometrics.fingerprint@2.1-service", + name: "android.hardware.biometrics.fingerprint@2.1-service.nothing", defaults: ["hidl_defaults"], - init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.rc"], - vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.xml"], + init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.nothing.rc"], + vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.nothing.xml"], vendor: true, relative_install_path: "hw", srcs: [ @@ -28,11 +28,11 @@ cc_binary { "android.hardware.biometrics.fingerprint@2.1", ], - header_libs: ["xiaomifingerprint_headers"], + header_libs: ["nothingfingerprint_headers"], } cc_library_headers { - name: "xiaomifingerprint_headers", + name: "nothingfingerprint_headers", export_include_dirs: ["include"], vendor: true, header_libs: ["libhardware_headers"], diff --git a/hidl/biometrics/fingerprint/BiometricsFingerprint.cpp b/hidl/biometrics/fingerprint/BiometricsFingerprint.cpp index 6c5fc3f..781a187 100644 --- a/hidl/biometrics/fingerprint/BiometricsFingerprint.cpp +++ b/hidl/biometrics/fingerprint/BiometricsFingerprint.cpp @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service" -#define LOG_VERBOSE "android.hardware.biometrics.fingerprint@2.1-service" +#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.nothing" +#define LOG_VERBOSE "android.hardware.biometrics.fingerprint@2.1-service.nothing" #include diff --git a/hidl/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.rc b/hidl/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.nothing.rc similarity index 91% rename from hidl/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.rc rename to hidl/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.nothing.rc index 1667677..244c64d 100644 --- a/hidl/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.rc +++ b/hidl/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.nothing.rc @@ -1,4 +1,4 @@ -service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service +service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.nothing # "class hal" causes a race condition on some devices due to files created # in /data. As a workaround, postpone startup until later in boot once # /data is mounted. diff --git a/hidl/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xml b/hidl/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.nothing.xml similarity index 100% rename from hidl/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xml rename to hidl/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.nothing.xml diff --git a/hidl/biometrics/fingerprint/service.cpp b/hidl/biometrics/fingerprint/service.cpp index edfaac4..1e8caf8 100644 --- a/hidl/biometrics/fingerprint/service.cpp +++ b/hidl/biometrics/fingerprint/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service" +#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.nothing" #include #include