From 5bd625a261a0992a606e35fa713ad877f9829582 Mon Sep 17 00:00:00 2001 From: mattgilbride Date: Wed, 14 Dec 2022 13:28:23 +0000 Subject: [PATCH] InputManagerService - call PermissionEnforcer helper on methods annotated with @EnforcePermission All java methods annotated with @EnforcePermission must call super._enforcePermission method provided by PermissionEnforcer. This method exists in U (currently aosp). Bug: 262456703 Test: TH Merged-In: I39a8583c4732b3d01de47b78955c3b8cff853f82 Change-Id: I09fcc610988452b5e23b5d2e910d241e41a73879 --- .../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 b214ca8173fe0..139217b91bd03 100644 --- a/services/core/java/com/android/server/input/InputManagerService.java +++ b/services/core/java/com/android/server/input/InputManagerService.java @@ -2683,6 +2683,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); }