From fd4c206f2ceb263b654495f306f694415e76fdcc Mon Sep 17 00:00:00 2001
From: Christopher Tate <ctate@google.com>
Date: Tue, 30 Mar 2021 15:51:29 -0700
Subject: [PATCH] Correct garbled rebase re FGS notification ratelimit

Bug: 183428469
Test: atest CtsAppTestCases:ServiceTest
Change-Id: I93a7c33490c2aaee876e2254589bb643508a5809
---
 .../java/com/android/server/am/ActiveServices.java    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 6809ad4ea378f..4c6a3f7c3f75d 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -1989,17 +1989,16 @@ public final class ActiveServices {
         final long now = SystemClock.uptimeMillis();
         final boolean isLegacyApp = (r.appInfo.targetSdkVersion < Build.VERSION_CODES.S);
 
-        boolean showNow = withinFgsDeferRateLimit(uid, now);
+        // Is the behavior enabled at all?
+        boolean showNow = !mAm.mConstants.mFlagFgsNotificationDeferralEnabled;
         if (!showNow) {
-            final boolean showLegacyNow = isLegacyApp
-                    && mAm.mConstants.mFlagFgsNotificationDeferralApiGated;
-            showNow = !mAm.mConstants.mFlagFgsNotificationDeferralEnabled || showLegacyNow;
+            // Did the app have another FGS notification deferred recently?
+            showNow = withinFgsDeferRateLimit(uid, now);
         }
         if (!showNow) {
             // Legacy apps' FGS notifications are not deferred unless the relevant
             // DeviceConfig element has been set
-            showNow = mAm.mConstants.mFlagFgsNotificationDeferralApiGated
-                    && isLegacyApp;
+            showNow = isLegacyApp && mAm.mConstants.mFlagFgsNotificationDeferralApiGated;
         }
         if (!showNow) {
             // has the app forced deferral?