From 9aa45dec42f3afabbd101beccbae5e878989a074 Mon Sep 17 00:00:00 2001
From: mattgilbride <mattgilbride@google.com>
Date: Thu, 3 Nov 2022 13:37:53 +0000
Subject: [PATCH] FingerprintService - call PermissionEnforcer helper on
 methods annotated with @EnforcePermission

Migrates all existing java methods annotated with @EnforcePermission
such that they call the super.<methodName>_enforcePermission
method provided by PermissionEnforcer.

This required by the @EnforcePermission annotation, but is currently a no-op, and will be switched on with ag/20325484.

Bug: 234083358
Test: TH
Change-Id: Iff0327fe516ef7916f616352df151347df28453f
---
 .../biometrics/sensors/fingerprint/FingerprintService.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
index 70470e90b3988..48367b28bb406 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
@@ -960,6 +960,8 @@ public class FingerprintService extends SystemService {
         @android.annotation.EnforcePermission(android.Manifest.permission.USE_BIOMETRIC_INTERNAL)
         @Override
         public void scheduleWatchdog() {
+            super.scheduleWatchdog_enforcePermission();
+
             final Pair<Integer, ServiceProvider> provider = mRegistry.getSingleProvider();
             if (provider == null) {
                 Slog.w(TAG, "Null provider for scheduling watchdog");