OSDN Git Service

fix fingerprint condition on sdk level logic
authorYifan Hong <elsk@google.com>
Fri, 18 May 2018 01:51:05 +0000 (18:51 -0700)
committerYifan Hong <elsk@google.com>
Fri, 18 May 2018 01:51:05 +0000 (18:51 -0700)
Change-Id: Icf83c62090943adb32972f08fa4335130ef68291
Fixes: 79950359
Test: fingerprint works

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

index c9f92d2..0b84bd9 100644 (file)
@@ -1499,8 +1499,10 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
             try {
                 userId = getUserOrWorkProfileId(clientPackage, userId);
                 if (userId != mCurrentUserId) {
+                    int firstSdkInt = Build.VERSION.FIRST_SDK_INT;
+                    if (firstSdkInt == 0) firstSdkInt = Build.VERSION.SDK_INT;
                     File baseDir;
-                    if (Build.VERSION.FIRST_SDK_INT <= Build.VERSION_CODES.O_MR1) {
+                    if (firstSdkInt <= Build.VERSION_CODES.O_MR1) {
                         baseDir = Environment.getUserSystemDirectory(userId);
                     } else {
                         baseDir = Environment.getDataVendorDeDirectory(userId);