From 8ecf5775a60b5b87127dd470f7901cd670dc1000 Mon Sep 17 00:00:00 2001
From: Dave Mankoff <mankoff@google.com>
Date: Thu, 22 Dec 2022 17:59:48 +0000
Subject: [PATCH] Ensure proguard doesn't over-optimize Flags Library.

In the main build, proguard is optimizing out Parcelable flags, which
means that clients of the library crash when they receive those flags
over the wire.

Telling proguard to keep Parcelable flags makes everything happy.

This fix is really for main, but the behavior is desired in qpr as
well, (even though proguard doesn't cause a problem in qpr).

Fixes: 254310572
Test: manually built and run on main/master
Change-Id: I541c405cd5642fae7c0cbdbf3ddcffd49e19eed1
---
 packages/SystemUI/shared/Android.bp           | 3 +++
 packages/SystemUI/shared/proguard_flags.flags | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 packages/SystemUI/shared/proguard_flags.flags

diff --git a/packages/SystemUI/shared/Android.bp b/packages/SystemUI/shared/Android.bp
index b679cfa145d43..b7d9df9217b22 100644
--- a/packages/SystemUI/shared/Android.bp
+++ b/packages/SystemUI/shared/Android.bp
@@ -85,6 +85,9 @@ java_library {
     static_libs: [
         "SystemUI-flag-types",
     ],
+    optimize: {
+        proguard_flags_files: ["proguard_flags.flags"],
+    },
     java_version: "1.8",
     min_sdk_version: "current",
 }
diff --git a/packages/SystemUI/shared/proguard_flags.flags b/packages/SystemUI/shared/proguard_flags.flags
new file mode 100644
index 0000000000000..08859cd8a10f6
--- /dev/null
+++ b/packages/SystemUI/shared/proguard_flags.flags
@@ -0,0 +1 @@
+-keep class * implements com.android.systemui.flags.ParcelableFlag
\ No newline at end of file