Merge "Only check exempted package list if standby is enabled." into rvc-dev

2020-06-10 18:59:30 +00:00
parent 76810f4432 15eaef3674
commit 26bfc5419c
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/AppStateTracker.java
+++ b/services/core/java/com/android/server/AppStateTracker.java
@@ -1120,7 +1120,8 @@ public class AppStateTracker {
                return false;
            }
            final int userId = UserHandle.getUserId(uid);
-            if (mExemptedPackages.contains(userId, packageName)) {
+            if (mAppStandbyInternal.isAppIdleEnabled() && !mAppStandbyInternal.isInParole()
+                    && mExemptedPackages.contains(userId, packageName)) {
                return false;
            }
            return mForceAllAppsStandby;