summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Christoffer Adamsen <christofferqa@google.com> 2025-01-08 02:21:07 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-08 02:21:07 -0800
commit7fccce76ddee673d5aef37e6d76b754137077274 (patch)
treebf306a7848412342e45e2c0b2d6a37b389695a8f
parent73c589bc96f711980d26c4e16abc4fa2a9ffcb9f (diff)
parent3ffa87b09d44df29b97523ab874850c23e81beed (diff)
Merge "SystemUI: Add keep rule for VendorServices constructor" into main am: 3ffa87b09d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3435879 Change-Id: I8c1f8f053225fff77ebe64d4dabcf31484d05d56 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/proguard_common.flags8
1 files changed, 7 insertions, 1 deletions
diff --git a/packages/SystemUI/proguard_common.flags b/packages/SystemUI/proguard_common.flags
index 162d8aebfc62..02b2bcf8e40d 100644
--- a/packages/SystemUI/proguard_common.flags
+++ b/packages/SystemUI/proguard_common.flags
@@ -1,5 +1,11 @@
-include proguard_kotlin.flags
--keep class com.android.systemui.VendorServices
+
+# VendorServices implements CoreStartable and may be instantiated reflectively in
+# SystemUIApplication#startAdditionalStartable.
+# TODO(b/373579455): Rewrite this to a @UsesReflection keep annotation.
+-keep class com.android.systemui.VendorServices {
+ public void <init>();
+}
# Needed to ensure callback field references are kept in their respective
# owning classes when the downstream callback registrars only store weak refs.