commit 9aa45dec42f3afabbd101beccbae5e878989a074
author mattgilbride <mattgilbride@google.com> Thu Nov 03 13:37:53 2022 +0000
committer Matt Gilbride <mattgilbride@google.com> Thu Nov 03 19:18:08 2022 +0000
tree 98199c1d89f267d74d3c2d8db77e482bc27c22a3
parent 66257b83b94b7ac2dded1cfb24e49553f9c3b1ba

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

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

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 70470e9..48367b2 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 @@
         @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");