From 9237e8e8831ab20667970136c2276aed076fac92 Mon Sep 17 00:00:00 2001
From: mattgilbride <mattgilbride@google.com>
Date: Sun, 13 Nov 2022 18:48:07 +0000
Subject: [PATCH] InputManagerService - call PermissionEnforcer helper on
 methods annotated with @EnforcePermission

All ava methods annotated with @EnforcePermission
must call 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.

This CL migrates incremental additions made since the original LSC
ag/20189550.

Bug: 234083358
Test: TH
Change-Id: I39a8583c4732b3d01de47b78955c3b8cff853f82
---
 .../core/java/com/android/server/input/InputManagerService.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
index d15f68cf7cac2..c9a764662d7fe 100644
--- a/services/core/java/com/android/server/input/InputManagerService.java
+++ b/services/core/java/com/android/server/input/InputManagerService.java
@@ -2685,6 +2685,8 @@ public class InputManagerService extends IInputManager.Stub
     @EnforcePermission(Manifest.permission.MONITOR_INPUT)
     @Override
     public void pilferPointers(IBinder inputChannelToken) {
+        super.pilferPointers_enforcePermission();
+
         Objects.requireNonNull(inputChannelToken);
         mNative.pilferPointers(inputChannelToken);
     }