commit 648c2950a7cf84931edb064a11c375e690937dd1
author Robert Snoeberger <snoeberger@google.com> Thu Aug 22 17:56:01 2019 -0400
committer Robert Snoeberger <snoeberger@google.com> Thu Aug 22 22:28:58 2019 +0000
tree a0b6981dfd44e641bfd2221f427a3417b368c3ba
parent 55a6847a1991ff5474267ec9d313570dfcde11af

Help prevent OOM while running SystemUI tests on cuttlefish.

Don't setup (choose) a FalsingManager implementation every time that
DeviceConfig.OnPropertiesChangedListener fires.

Bug: 139860714
Test: run `atest frameworks/base/packages/SystemUI/tests/` on cuttlefish, verify no OOM
Change-Id: I80408c4f9097f74b8170e7be478229b4538ef0a5

packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java

diff --git a/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java b/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java
index ee79e6b..4120334 100644
--- a/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java
+++ b/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java
@@ -52,16 +52,17 @@
 
     private FalsingManager mInternalFalsingManager;
     private final Handler mMainHandler;
+    private boolean mBrightlineEnabled;
 
     @Inject
     FalsingManagerProxy(Context context, PluginManager pluginManager,
             @Named(MAIN_HANDLER_NAME) Handler handler) {
         mMainHandler = handler;
+        setupFalsingManager(context);
         DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_SYSTEMUI,
                 command -> mMainHandler.post(command),
                 properties -> onDeviceConfigPropertiesChanged(context, properties.getNamespace())
         );
-        setupFalsingManager(context);
         final PluginListener<FalsingPlugin> mPluginListener = new PluginListener<FalsingPlugin>() {
             public void onPluginConnected(FalsingPlugin plugin, Context context) {
                 FalsingManager pluginFalsingManager = plugin.getFalsingManager(context);
@@ -94,6 +95,10 @@
     public void setupFalsingManager(Context context) {
         boolean brightlineEnabled = DeviceConfig.getBoolean(
                 DeviceConfig.NAMESPACE_SYSTEMUI, BRIGHTLINE_FALSING_MANAGER_ENABLED, true);
+        if (brightlineEnabled == mBrightlineEnabled && mInternalFalsingManager != null) {
+            return;
+        }
+        mBrightlineEnabled = brightlineEnabled;
 
         if (mInternalFalsingManager != null) {
             mInternalFalsingManager.cleanup();