From 456461238f86e1ff42b5b07de22c3231bee9bc6f Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Mon, 21 May 2018 12:38:10 -0700 Subject: [PATCH] FingerprintService: requires ro.product.first_api_level Test: fingerprint registration works Bug: 79950359 Change-Id: I1c75b9258a5c63b23fa2c546f002a596c9d55dc3 --- .../com/android/server/fingerprint/FingerprintService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java index 2a6f7c8eaadb3..06329e571b433 100644 --- a/services/core/java/com/android/server/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java @@ -1500,7 +1500,10 @@ public class FingerprintService extends SystemService implements IHwBinder.Death userId = getUserOrWorkProfileId(clientPackage, userId); if (userId != mCurrentUserId) { int firstSdkInt = Build.VERSION.FIRST_SDK_INT; - if (firstSdkInt == 0) firstSdkInt = Build.VERSION.SDK_INT; + if (firstSdkInt < Build.VERSION_CODES.BASE) { + Slog.e(TAG, "First SDK version " + firstSdkInt + " is invalid; must be " + + "at least VERSION_CODES.BASE"); + } File baseDir; if (firstSdkInt <= Build.VERSION_CODES.O_MR1) { baseDir = Environment.getUserSystemDirectory(userId);