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

Commit 31abe4a3 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "FingerprintService: requires ro.product.first_api_level" into... 

Merge "Merge "FingerprintService: requires ro.product.first_api_level" into pi-dev am: 908b548f" into pi-dev-plus-aosp
parents 9684a40a a10412d5

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);