From 8addd4f67eb94780f39dba42cd2bcde418dd4145 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Thu, 25 Apr 2019 12:34:15 -0700
Subject: Check INTERACT_ACROSS_USERS for getEnrolledTemplates when user is
 different

Fixes: 128599663

Test: Fingerprint enroll/auth works as expected
Change-Id: I18d22d802e6f691056a525c22b221b01b6528ea8
---
 .../com/android/server/biometrics/fingerprint/FingerprintService.java  | 3 +++
 1 file changed, 3 insertions(+)

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 3d9a47be56ea..6ebeaf9ebe59 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 @@ public class FingerprintService extends BiometricServiceBase {
 
     @Override
     protected List<Fingerprint> getEnrolledTemplates(int userId) {
+        if (userId != UserHandle.getCallingUserId()) {
+            checkPermission(INTERACT_ACROSS_USERS);
+        }
         return getBiometricUtils().getBiometricsForUser(getContext(), userId);
     }
 
-- 
cgit v1.2.3-59-g8ed1b