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

Commit 904c4381 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove no longer needed workaround for new devices that previously" into pi-dev

parents 0302f56c b6821d49

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

+1 −5
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ import android.os.RemoteException; 
import android.os.SELinux;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.security.KeyStore;
@@ -1488,10 +1487,7 @@ public class FingerprintService extends SystemService implements IHwBinder.Death 
                userId = getUserOrWorkProfileId(clientPackage, userId);

                if (userId != mCurrentUserId) {

                    File baseDir;

                    if (Build.VERSION.FIRST_SDK_INT <= Build.VERSION_CODES.O_MR1

                            && !SystemProperties.getBoolean(

                                "ro.treble.supports_vendor_data", false)) {

                        // TODO(b/72405644) remove the override when possible.

                    if (Build.VERSION.FIRST_SDK_INT <= Build.VERSION_CODES.O_MR1) {

                        baseDir = Environment.getUserSystemDirectory(userId);

                    } else {

                        baseDir = Environment.getDataVendorDeDirectory(userId);