Merge "Fix oneway complaints for fingerprint auth." into sc-dev (a7b1096c) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -811,7 +811,7 @@ public class FingerprintService extends SystemService {
		for (String instance : instances) {
		final String fqName = IFingerprint.DESCRIPTOR + "/" + instance;
		final IFingerprint fp = IFingerprint.Stub.asInterface(
		ServiceManager.waitForDeclaredService(fqName));
		Binder.allowBlocking(ServiceManager.waitForDeclaredService(fqName)));
		if (fp == null) {
		Slog.e(TAG, "Unable to get declared service: " + fqName);
		continue;

+4 −2

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import android.hardware.fingerprint.FingerprintManager;
		import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
		import android.hardware.fingerprint.IFingerprintServiceReceiver;
		import android.hardware.fingerprint.IUdfpsOverlayController;
		import android.os.Binder;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.Looper;
		@@ -186,8 +187,9 @@ public class FingerprintProvider implements IBinder.DeathRecipient, ServiceProvi
		Slog.d(getTag(), "Daemon was null, reconnecting");

		mDaemon = IFingerprint.Stub.asInterface(
		ServiceManager.waitForDeclaredService(IFingerprint.DESCRIPTOR
		+ "/" + mHalInstanceName));
		Binder.allowBlocking(
		ServiceManager.waitForDeclaredService(
		IFingerprint.DESCRIPTOR + "/" + mHalInstanceName)));
		if (mDaemon == null) {
		Slog.e(getTag(), "Unable to get daemon");
		return null;