From edc6b613415cf07f5c864bfb90998b33adae6c4b Mon Sep 17 00:00:00 2001 From: Danny Baumann Date: Fri, 22 Sep 2017 08:30:12 +0200 Subject: fingerprint: Rename to fingerprint@2.0-service Turns out you _can_ rename service's versions so just do that. Also change log tags to 2.0 service as well Change-Id: Ie5c5d0d4ab06433015bd643046fe1c7037874f12 --- biometrics/fingerprint/Android.bp | 4 ++-- biometrics/fingerprint/BiometricsFingerprint.cpp | 4 ++-- .../android.hardware.biometrics.fingerprint@2.0-service.rc | 7 +++++++ .../android.hardware.biometrics.fingerprint@2.1-service.2.0.rc | 7 ------- 4 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.0-service.rc delete mode 100644 biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.2.0.rc diff --git a/biometrics/fingerprint/Android.bp b/biometrics/fingerprint/Android.bp index 583b0cf..86d3fab 100644 --- a/biometrics/fingerprint/Android.bp +++ b/biometrics/fingerprint/Android.bp @@ -14,9 +14,9 @@ // See the License for the specific language governing permissions and // limitations under the License. cc_binary { - name: "android.hardware.biometrics.fingerprint@2.1-service.2.0", + name: "android.hardware.biometrics.fingerprint@2.0-service", relative_install_path: "hw", - init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.2.0.rc"], + init_rc: ["android.hardware.biometrics.fingerprint@2.0-service.rc"], srcs: ["service.cpp", "BiometricsFingerprint.cpp"], shared_libs: [ "libutils", diff --git a/biometrics/fingerprint/BiometricsFingerprint.cpp b/biometrics/fingerprint/BiometricsFingerprint.cpp index 7cf71b6..a83839f 100644 --- a/biometrics/fingerprint/BiometricsFingerprint.cpp +++ b/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.0-service" +#define LOG_VERBOSE "android.hardware.biometrics.fingerprint@2.0-service" #include diff --git a/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.0-service.rc b/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.0-service.rc new file mode 100644 index 0000000..076d904 --- /dev/null +++ b/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.0-service.rc @@ -0,0 +1,7 @@ +service fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.0-service + # "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. + class late_start + user system + group system input diff --git a/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.2.0.rc b/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.2.0.rc deleted file mode 100644 index 4be55f9..0000000 --- a/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.2.0.rc +++ /dev/null @@ -1,7 +0,0 @@ -service fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.2.0 - # "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. - class late_start - user system - group system input -- cgit v1.2.3