Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a10412d5 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "FingerprintService: requires ro.product.first_api_level" into pi-dev 

am: 908b548f

Change-Id: Id568f13a8f143e0c05c0efe482e0a05158127114
parents 94fe7b3c 908b548f

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -1500,7 +1500,10 @@ public class FingerprintService extends SystemService implements IHwBinder.Death 
                userId = getUserOrWorkProfileId(clientPackage, userId);

                userId = getUserOrWorkProfileId(clientPackage, userId);

                if (userId != mCurrentUserId) {

                if (userId != mCurrentUserId) {

                    int firstSdkInt = Build.VERSION.FIRST_SDK_INT;

                    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;

                    File baseDir;

                    if (firstSdkInt <= Build.VERSION_CODES.O_MR1) {

                    if (firstSdkInt <= Build.VERSION_CODES.O_MR1) {

                        baseDir = Environment.getUserSystemDirectory(userId);

                        baseDir = Environment.getUserSystemDirectory(userId);