commit 0f42165611164fc8d996030a135520d65dd36e7f
author Android Merger <noreply-android-build-merger@google.com> Thu Oct 18 04:08:38 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 18 04:08:38 2018 +0000
tree d6d44fd67d9798bb8309ca62169a7a050d144e4b
parent e70b637f7c07e1916b5a0738a1745ce9a4eb3c47
parent 12e3e04ccd392825065ce3283609b81a6b9630bf

Merge "Merge "App Standby Settings key is set incorrectly" into pie-cts-dev am: 8f74ba97f8"

common/device-side/util/src/com/android/compatibility/common/util/AppStandbyUtils.java

diff --git a/common/device-side/util/src/com/android/compatibility/common/util/AppStandbyUtils.java b/common/device-side/util/src/com/android/compatibility/common/util/AppStandbyUtils.java
index a1adc02..eb94b60 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/AppStandbyUtils.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/AppStandbyUtils.java
@@ -59,7 +59,8 @@
     public static boolean isAppStandbyEnabledAtRuntime() {
         final String result =
                 SystemUtil.runShellCommand("settings get global app_standby_enabled").trim();
-        final boolean boolResult = result.equals("1");
+        // framework considers null value as enabled.
+        final boolean boolResult = result.equals("1") || result.equals("null");
         Log.d(TAG, "AppStandby is " + (boolResult ? "enabled" : "disabled") + " at runtime.");
         return boolResult;
     }