commit a2f8ee470119c7114db7ec9baa63c7b6d4cf8a47
author Kevin Chyn <kchyn@google.com> Thu Apr 25 22:48:20 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 25 22:48:20 2019 +0000
tree 1c50eb7a162d0c0335f759218f67584afdd14aaf
parent 7d56862c0317e85152ee4746ffe3d1fb37954531
parent 8addd4f67eb94780f39dba42cd2bcde418dd4145

Merge "Check INTERACT_ACROSS_USERS for getEnrolledTemplates when user is different" into qt-dev

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

diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
index 3d9a47b..6ebeaf9 100644
--- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
@@ -855,6 +855,9 @@
 
     @Override
     protected List<Fingerprint> getEnrolledTemplates(int userId) {
+        if (userId != UserHandle.getCallingUserId()) {
+            checkPermission(INTERACT_ACROSS_USERS);
+        }
         return getBiometricUtils().getBiometricsForUser(getContext(), userId);
     }