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

This commit is contained in:
TreeHugger Robot
2018-05-18 19:01:00 +00:00
committed by Android (Google) Code Review

View File

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