otter: fingerprint: rebrand for otter

Change-Id: Ica232894fa3d05e7ff497ad09ae4a88bba2afae4
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/fingerprint/Android.bp b/fingerprint/Android.bp
index 4d5cc8d..6738385 100644
--- a/fingerprint/Android.bp
+++ b/fingerprint/Android.bp
@@ -1,17 +1,12 @@
 package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_interfaces_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 cc_binary {
-    name: "android.hardware.biometrics.fingerprint@2.1-service",
+    name: "android.hardware.biometrics.fingerprint@2.1-service.otter",
     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.otter.rc"],
+    vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.otter.xml"],
     vendor: true,
     relative_install_path: "hw",
     srcs: [
diff --git a/fingerprint/BiometricsFingerprint.cpp b/fingerprint/BiometricsFingerprint.cpp
index f687959..1245cf1 100644
--- a/fingerprint/BiometricsFingerprint.cpp
+++ b/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.otter"
+#define LOG_VERBOSE "android.hardware.biometrics.fingerprint@2.1-service.otter"
 
 #include <hardware/hw_auth_token.h>
 
diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.rc b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.otter.rc
similarity index 90%
rename from fingerprint/android.hardware.biometrics.fingerprint@2.1-service.rc
rename to fingerprint/android.hardware.biometrics.fingerprint@2.1-service.otter.rc
index fb76fe4..7c03993 100644
--- a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.rc
+++ b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.otter.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.otter
     # "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/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xml b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.otter.xml
similarity index 100%
rename from fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xml
rename to fingerprint/android.hardware.biometrics.fingerprint@2.1-service.otter.xml
diff --git a/fingerprint/service.cpp b/fingerprint/service.cpp
index edfaac4..54c2071 100644
--- a/fingerprint/service.cpp
+++ b/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.otter"
 
 #include <android/log.h>
 #include <hidl/HidlSupport.h>