summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Prabir Pradhan <prabirmsp@google.com> 2022-08-23 22:48:06 +0000
committer Prabir Pradhan <prabirmsp@google.com> 2022-08-23 22:52:22 +0000
commitfa2b957796c0c06dc0ffbf7c8d7622d311ea23ea (patch)
tree3150a07be009cecfdb269cbb245c04414f8c6b43
parent51603de7ddb77d0b57da3266dff069cef057bbba (diff)
Prevent native methods in InputManagerService from being removed
Add a proguard rule to prevent native methods in InputManagerService from being removed. If proguard removes one of these methods, the system crashes at boot when it tries to register the native implementation through JNI, resulting in a hard-to-debug bootloop. Bug: None Test: manual Change-Id: I528bd97c9ef179ff18e3e0ad95a4e9a015b7e6c9
-rw-r--r--services/proguard.flags3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/proguard.flags b/services/proguard.flags
index c9303462fb6a..606f360f2cc5 100644
--- a/services/proguard.flags
+++ b/services/proguard.flags
@@ -104,6 +104,9 @@
-keep,allowoptimization,allowaccessmodification class com.android.server.input.InputManagerService {
<methods>;
}
+-keep,allowoptimization,allowaccessmodification class com.android.server.input.NativeInputManagerService$NativeImpl {
+ <methods>;
+}
-keep,allowoptimization,allowaccessmodification class com.android.server.usb.UsbHostManager {
*** usbDeviceRemoved(...);
*** usbDeviceAdded(...);