Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid incorrectly overriding while-in-use reason." into udc-dev am: 76039598a3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23519522

Change-Id: Ia5a6517b104fff7c9c7c9cfae2f35c9573446f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kweku Adams
2023-06-02 15:28:43 +00:00
committed by Automerger Merge Worker
parent 719c89e0f7 76039598a3
commit a43597c65e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -70,6 +70,7 @@ import static android.os.PowerExemptionManager.REASON_INSTR_BACKGROUND_FGS_PERMI
import static android.os.PowerExemptionManager.REASON_OPT_OUT_REQUESTED; import static android.os.PowerExemptionManager.REASON_OPT_OUT_REQUESTED;
import static android.os.PowerExemptionManager.REASON_OP_ACTIVATE_PLATFORM_VPN; import static android.os.PowerExemptionManager.REASON_OP_ACTIVATE_PLATFORM_VPN;
import static android.os.PowerExemptionManager.REASON_OP_ACTIVATE_VPN; import static android.os.PowerExemptionManager.REASON_OP_ACTIVATE_VPN;
import static android.os.PowerExemptionManager.REASON_OTHER;
import static android.os.PowerExemptionManager.REASON_PACKAGE_INSTALLER; import static android.os.PowerExemptionManager.REASON_PACKAGE_INSTALLER;
import static android.os.PowerExemptionManager.REASON_PROC_STATE_PERSISTENT; import static android.os.PowerExemptionManager.REASON_PROC_STATE_PERSISTENT;
import static android.os.PowerExemptionManager.REASON_PROC_STATE_PERSISTENT_UI; import static android.os.PowerExemptionManager.REASON_PROC_STATE_PERSISTENT_UI;
@@ -85,7 +86,6 @@ import static android.os.PowerExemptionManager.REASON_SYSTEM_MODULE;
import static android.os.PowerExemptionManager.REASON_SYSTEM_UID; import static android.os.PowerExemptionManager.REASON_SYSTEM_UID;
import static android.os.PowerExemptionManager.REASON_TEMP_ALLOWED_WHILE_IN_USE; import static android.os.PowerExemptionManager.REASON_TEMP_ALLOWED_WHILE_IN_USE;
import static android.os.PowerExemptionManager.REASON_UID_VISIBLE; import static android.os.PowerExemptionManager.REASON_UID_VISIBLE;
import static android.os.PowerExemptionManager.REASON_UNKNOWN;
import static android.os.PowerExemptionManager.TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_ALLOWED; import static android.os.PowerExemptionManager.TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_ALLOWED;
import static android.os.PowerExemptionManager.getReasonCodeFromProcState; import static android.os.PowerExemptionManager.getReasonCodeFromProcState;
import static android.os.PowerExemptionManager.reasonCodeToString; import static android.os.PowerExemptionManager.reasonCodeToString;
@@ -7428,33 +7428,34 @@ public final class ActiveServices {
boolean isStartService) { boolean isStartService) {
// Check DeviceConfig flag. // Check DeviceConfig flag.
if (!mAm.mConstants.mFlagBackgroundFgsStartRestrictionEnabled) { if (!mAm.mConstants.mFlagBackgroundFgsStartRestrictionEnabled) {
if (!r.mAllowWhileInUsePermissionInFgs) {
// BGFGS start restrictions are disabled. We're allowing while-in-use permissions.
// Note REASON_OTHER since there's no other suitable reason.
r.mAllowWhileInUsePermissionInFgsReason = REASON_OTHER;
}
r.mAllowWhileInUsePermissionInFgs = true; r.mAllowWhileInUsePermissionInFgs = true;
} }
final @ReasonCode int allowWhileInUse;
// Either (or both) mAllowWhileInUsePermissionInFgs or mAllowStartForeground is // Either (or both) mAllowWhileInUsePermissionInFgs or mAllowStartForeground is
// newly allowed? // newly allowed?
boolean newlyAllowed = false; boolean newlyAllowed = false;
if (!r.mAllowWhileInUsePermissionInFgs if (!r.mAllowWhileInUsePermissionInFgs
|| (r.mAllowStartForeground == REASON_DENIED)) { || (r.mAllowStartForeground == REASON_DENIED)) {
allowWhileInUse = shouldAllowFgsWhileInUsePermissionLocked( @ReasonCode final int allowWhileInUse = shouldAllowFgsWhileInUsePermissionLocked(
callingPackage, callingPid, callingUid, r.app, backgroundStartPrivileges, callingPackage, callingPid, callingUid, r.app, backgroundStartPrivileges,
isBindService); isBindService);
// We store them to compare the old and new while-in-use logics to each other. // We store them to compare the old and new while-in-use logics to each other.
// (They're not used for any other purposes.) // (They're not used for any other purposes.)
if (!r.mAllowWhileInUsePermissionInFgs) { if (!r.mAllowWhileInUsePermissionInFgs) {
r.mAllowWhileInUsePermissionInFgs = (allowWhileInUse != REASON_DENIED); r.mAllowWhileInUsePermissionInFgs = (allowWhileInUse != REASON_DENIED);
r.mAllowWhileInUsePermissionInFgsReason = allowWhileInUse;
} }
if (r.mAllowStartForeground == REASON_DENIED) { if (r.mAllowStartForeground == REASON_DENIED) {
r.mAllowStartForeground = shouldAllowFgsStartForegroundWithBindingCheckLocked( r.mAllowStartForeground = shouldAllowFgsStartForegroundWithBindingCheckLocked(
allowWhileInUse, callingPackage, callingPid, callingUid, intent, r, allowWhileInUse, callingPackage, callingPid, callingUid, intent, r,
backgroundStartPrivileges, isBindService); backgroundStartPrivileges, isBindService);
} }
} else {
allowWhileInUse = REASON_UNKNOWN;
} }
r.mAllowWhileInUsePermissionInFgsReason = allowWhileInUse;
} }
/** /**