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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-18 19:01:00 +00:00
committed by Android (Google) Code Review
parent 9978ac5147 5670247168
commit 69e88693d8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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