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

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

Merge "fix fingerprint condition on sdk level logic" into pi-dev 

am: 69e88693

Change-Id: Ie587e46c28e81c051103fb5a8d5053d5a4ebd583
parents 94e38523 69e88693

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

+3 −1
Original line number Diff line number Diff line
@@ -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);