From b6821d49f62dfd5d2481471e23a74a783d0cda8f Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Wed, 28 Mar 2018 09:56:35 -0700 Subject: Remove no longer needed workaround for new devices that previously advertised a wrong Build.FIRST_SDK_INT. All devices shipped with P or later now use the new /data/vendor_de storage location for fingerprint data. Bug: 72405644 Test: fingerprints work on device and are installed in data/vendor_de Change-Id: I1031ca6f09ea712568716c0ba77c74730e239a7a --- .../java/com/android/server/fingerprint/FingerprintService.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java index fc8aace162dc..4ea4c2293dba 100644 --- a/services/core/java/com/android/server/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java @@ -61,7 +61,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; @@ -1483,10 +1482,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); -- cgit v1.2.3-59-g8ed1b