Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8f585d4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[fgs] Add WIU ability to BFSL debug string" into main

parents 7d2f2aed e4bdb439

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

+1 −2
Original line number Diff line number Diff line
@@ -8302,8 +8302,6 @@ public final class ActiveServices { 
        if ((allowWiu == REASON_DENIED) || (allowStart == REASON_DENIED)) {

            @ReasonCode final int allowWhileInUse = shouldAllowFgsWhileInUsePermissionLocked(

                    callingPackage, callingPid, callingUid, r.app, backgroundStartPrivileges);

            // We store them to compare the old and new while-in-use logics to each other.

            // (They're not used for any other purposes.)

            if (allowWiu == REASON_DENIED) {

                allowWiu = allowWhileInUse;

            }
@@ -8706,6 +8704,7 @@ public final class ActiveServices { 
                                        + ",duration:" + tempAllowListReason.mDuration

                                        + ",callingUid:" + tempAllowListReason.mCallingUid))

                        + ">"

                        + "; allowWiu:" + allowWhileInUse

                        + "; targetSdkVersion:" + r.appInfo.targetSdkVersion

                        + "; callerTargetSdkVersion:" + callerTargetSdkVersion

                        + "; startForegroundCount:" + r.mStartForegroundCount