commit b4f0f300fae11b77c8e2e92a6dd07ea119ee23d2
author Pechetty Sravani <pechetty@google.com> Thu Feb 29 09:19:15 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 29 09:19:15 2024 +0000
tree 139095c196b0bbace6a5b492b99c35b9c9c17642
parent ce5f8eb50913e9a56823feccc2b2e0144e12ab3a

Revert "Disabling FGS start from System Alert Window"

Revert submission 25506346-296558535

Reason for revert: Potential culprit for b/327528820- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:25506346-296558535

Change-Id: I7f400d2f5ae77281614f49b760301b5b396e4475

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

diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 33ca15a..b8f6b3f 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -372,15 +372,6 @@
     @Overridable
     public static final long FGS_BOOT_COMPLETED_RESTRICTIONS = 296558535L;
 
-    /**
-     * Disables foreground service background starts in System Alert Window for all types
-     * unless it already has a System Overlay Window.
-     */
-    @ChangeId
-    @EnabledSince(targetSdkVersion = VERSION_CODES.VANILLA_ICE_CREAM)
-    @Overridable
-    public static final long FGS_SAW_RESTRICTIONS = 319471980L;
-
     final ActivityManagerService mAm;
 
     // Maximum number of services that we allow to start in the background
@@ -8534,31 +8525,10 @@
             }
         }
 
-        // The flag being enabled isn't enough to deny background start: we need to also check
-        // if there is a system alert UI present.
         if (ret == REASON_DENIED) {
-            // Flag check: are we disabling SAW FGS background starts?
-            final boolean shouldDisableSaw = Flags.fgsDisableSaw()
-                    && CompatChanges.isChangeEnabled(FGS_BOOT_COMPLETED_RESTRICTIONS, callingUid);
-            if (shouldDisableSaw) {
-                final ProcessRecord processRecord = mAm
-                        .getProcessRecordLocked(targetService.processName,
-                        targetService.appInfo.uid);
-                if (processRecord != null) {
-                    if (processRecord.mState.hasOverlayUi()) {
-                        if (mAm.mAtmInternal.hasSystemAlertWindowPermission(callingUid, callingPid,
-                                callingPackage)) {
-                            ret = REASON_SYSTEM_ALERT_WINDOW_PERMISSION;
-                        }
-                    }
-                } else {
-                    Slog.e(TAG, "Could not find process record for SAW check");
-                }
-            } else {
-                if (mAm.mAtmInternal.hasSystemAlertWindowPermission(callingUid, callingPid,
-                        callingPackage)) {
-                    ret = REASON_SYSTEM_ALERT_WINDOW_PERMISSION;
-                }
+            if (mAm.mAtmInternal.hasSystemAlertWindowPermission(callingUid, callingPid,
+                    callingPackage)) {
+                ret = REASON_SYSTEM_ALERT_WINDOW_PERMISSION;
             }
         }
 

services/core/java/com/android/server/am/flags.aconfig

diff --git a/services/core/java/com/android/server/am/flags.aconfig b/services/core/java/com/android/server/am/flags.aconfig
index e955b00..16dbe18 100644
--- a/services/core/java/com/android/server/am/flags.aconfig
+++ b/services/core/java/com/android/server/am/flags.aconfig
@@ -23,13 +23,6 @@
 }
 
 flag {
-    name: "fgs_disable_saw"
-    namespace: "backstage_power"
-    description: "Disable System Alert Window FGS start"
-    bug: "296558535"
-}
-
-flag {
     name: "bfgs_managed_network_access"
     namespace: "backstage_power"
     description: "Restrict network access for certain applications in BFGS process state"