commit 3b5952e0cc47849b63c3bff286dca4ca02d39db3
author Mahesh Kumar <mahesh.kumar@mediatek.com> Wed Oct 17 21:12:42 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 17 21:12:42 2018 -0700
tree 357e6dbf1da4863917f264178f5a545475a39ed2
parent 59eb0cbac27a22b26b245cbaee16f713366d5064
parent 624c0f9a0f5d5ef1977f6998ff394bb0dabb668b

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

Change-Id: I8976ba1a9f16020b538d8c546f7c042ffe81e172

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;
     }