From 25d5eaa14ccdfa767588f9b15d05ec37d860fbc7 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Thu, 16 Mar 2017 15:25:43 -0700 Subject: [PATCH] IBiometricsFingerprint uses "default" service name The getService() and registerAsService() methods of interface objects now have default parameters of "default" for the service name. HALs will not have to use any service name unless they want to register more than one service. Test: fingerprint works Bug: 33844934 Change-Id: Ie5c03ff0e2fc38a1e41e2c292fc76b7592c33eb7 --- .../com/android/server/fingerprint/FingerprintService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java index 32621515130de..bdba64f72995c 100644 --- a/services/core/java/com/android/server/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java @@ -97,7 +97,6 @@ public class FingerprintService extends SystemService implements IHwBinder.Death static final String TAG = "FingerprintService"; static final boolean DEBUG = true; private static final String FP_DATA_DIR = "fpdata"; - private static final String FINGERPRINT_HIDL = "fingerprint_hal"; private static final int MSG_USER_SWITCHING = 10; private static final String ACTION_LOCKOUT_RESET = "com.android.server.fingerprint.ACTION_LOCKOUT_RESET"; @@ -219,7 +218,7 @@ public class FingerprintService extends SystemService implements IHwBinder.Death public synchronized IBiometricsFingerprint getFingerprintDaemon() { if (mDaemon == null) { try { - mDaemon = IBiometricsFingerprint.getService(FINGERPRINT_HIDL); + mDaemon = IBiometricsFingerprint.getService(); } catch (java.util.NoSuchElementException e) { // Service doesn't exist or cannot be opened. Logged below. } catch (RemoteException e) {