commit 3a9b8aefcd2276b9df2dbfbc57eb2941c2ee119a
author Li Li <dualli@google.com> Fri Sep 17 11:01:56 2021 -0700
committer Li Li <dualli@google.com> Sat Sep 18 00:01:28 2021 +0000
tree 5b8ff5a7152f9d213397bdb133f173583a82e2d3
parent b7c776aa1966cef37af356d8a8dcff7cbd87aadd

Freezer: check freeze binder ioctl

Some old kernels don't have the necessary binder ioctls for freezer
(BINDER_FREEZE & BINDER_GET_FROZEN_INFO). In such a case, disable
freezer with a warning log.

Bug: 199803449
Test: confirm freezer is enabled/disabled on new/old kernels
Change-Id: I9e19515746d4c415dc5eb871e2d3e232c0876a15

services/core/java/com/android/server/am/CachedAppOptimizer.java

diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java
index 9da6d52..6230919 100644
--- a/services/core/java/com/android/server/am/CachedAppOptimizer.java
+++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java
@@ -645,21 +645,25 @@
             char state = (char) fr.read();
 
             if (state == '1' || state == '0') {
+                // Also check freezer binder ioctl
+                getBinderFreezeInfo(Process.myPid());
                 supported = true;
             } else {
                 Slog.e(TAG_AM, "unexpected value in cgroup.freeze");
             }
         } catch (java.io.FileNotFoundException e) {
-            Slog.d(TAG_AM, "cgroup.freeze not present");
+            Slog.w(TAG_AM, "cgroup.freeze not present");
+        } catch (RuntimeException e) {
+            Slog.w(TAG_AM, "unable to read freezer info");
         } catch (Exception e) {
-            Slog.d(TAG_AM, "unable to read cgroup.freeze: " + e.toString());
+            Slog.w(TAG_AM, "unable to read cgroup.freeze: " + e.toString());
         }
 
         if (fr != null) {
             try {
                 fr.close();
             } catch (java.io.IOException e) {
-                Slog.e(TAG_AM, "Exception closing freezer.killable: " + e.toString());
+                Slog.e(TAG_AM, "Exception closing cgroup.freeze: " + e.toString());
             }
         }