From 61339d80a287c04f28aa1e530f3c16402058b9c5 Mon Sep 17 00:00:00 2001
From: Chris Li <lihongyu@google.com>
Date: Wed, 15 Jun 2022 12:07:39 +0800
Subject: [PATCH] Keep OEM defined DisplayAreaPolicy.Provider

Without this change, it may throw ClassNotFoundException when OEMs
define their own DisplayAreaPolicy.Provider.

Fix: 235942308
Test: verify with a customized provider
Change-Id: I397f4fc05ecd5732e3ebb417de3a66c280f678b3
---
 services/proguard.flags | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/proguard.flags b/services/proguard.flags
index bad02b47031c..c648f7d3ac45 100644
--- a/services/proguard.flags
+++ b/services/proguard.flags
@@ -68,6 +68,9 @@
 # TODO(b/210510433): Revisit and consider generating from frameworks/base/core/res/res/values/config.xml.
 -keep,allowoptimization,allowaccessmodification public class com.android.server.notification.** implements com.android.server.notification.NotificationSignalExtractor
 
+# OEM provided DisplayAreaPolicy.Provider defined in frameworks/base/core/res/res/values/config.xml.
+-keep,allowoptimization,allowaccessmodification class com.android.server.wm.** implements com.android.server.wm.DisplayAreaPolicy$Provider
+
 # JNI keep rules
 # TODO(b/210510433): Revisit and fix with @Keep, or consider auto-generating from
 # frameworks/base/services/core/jni/onload.cpp.