From be4d539493848cad6a488481df4890886c66bfb6 Mon Sep 17 00:00:00 2001
From: Marco Ballesio <balejs@google.com>
Date: Fri, 5 Feb 2021 13:31:27 -0800
Subject: [PATCH] CachedAppOptimizer: enable single cgroup freezer

The cgroup v2 uid/pid hierarchy was reverted because of
http://b/179006802 leaving the underlying freezer implementation to a
single cgroup. Enable the freezer at boot until the new hierarchy can be
brought back.

Bug: 179006802
Test: verified that the freezer is enabled at boot
Change-Id: I88041a3efb06724e4bc2d78fea017778c365d387
---
 .../core/java/com/android/server/am/CachedAppOptimizer.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java
index 9e6d647dc0140..44ab9190004b5 100644
--- a/services/core/java/com/android/server/am/CachedAppOptimizer.java
+++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java
@@ -556,6 +556,10 @@ public final class CachedAppOptimizer {
 
             if (state == '1' || state == '0') {
                 supported = true;
+                // This is a workaround after reverting the cgroup v2 uid/pid hierarchy due to
+                // http://b/179006802.
+                // TODO: remove once the uid/pid hierarchy is restored
+                enableFreezerInternal(true);
             } else {
                 Slog.e(TAG_AM, "unexpected value in cgroup.freeze");
             }