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

Correct garbled rebase re FGS notification ratelimit

Browse Source 
Bug: 183428469
Test: atest CtsAppTestCases:ServiceTest
Change-Id: I93a7c33490c2aaee876e2254589bb643508a5809
This commit is contained in:
Christopher Tate
2021-03-30 15:51:29 -07:00
parent 2fcbd1290d
commit fd4c206f2c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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?