Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "FingerprintService: requires ro.product.first_api_level" into pi-dev am: 908b548f3c" into pi-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2018-05-21 22:35:35 +00:00
committed by Android (Google) Code Review
parent 9684a40a9c a10412d514
commit 31abe4a341
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/fingerprint/FingerprintService.java
View File

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