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

Merge changes from topic "presubmit-am-7202d37c8a894cf5bad2907ea7bd2625" into sc-v2-dev-plus-aosp

Browse Source 
* changes:
  [automerge] Remove toast window token after being rate-limited 2p: f53f2ad864
  Remove toast window token after being rate-limited
This commit is contained in:
TreeHugger Robot
2022-02-14 18:46:51 +00:00
committed by Android (Google) Code Review
parent 22e34be259 0dec19cc9e
commit f292c47a4a
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -7695,7 +7695,9 @@ public class NotificationManagerService extends SystemService {
int index = mToastQueue.indexOf(record);
if (index >= 0) {
mToastQueue.remove(index);
ToastRecord toast = mToastQueue.remove(index);
mWindowManagerInternal.removeWindowToken(
toast.windowToken, true /* removeWindows */, toast.displayId);
}
record = (mToastQueue.size() > 0) ? mToastQueue.get(0) : null;
}

34
services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
View File

@@ -60,6 +60,7 @@ import static android.service.notification.NotificationListenerService.FLAG_FILT
import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ONGOING;
import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE;
import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEUTRAL;
import static android.view.WindowManager.LayoutParams.TYPE_TOAST;
import static com.google.common.truth.Truth.assertThat;
@@ -5571,6 +5572,39 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
verify(mStatusBar).showToast(anyInt(), any(), any(), any(), any(), anyInt(), any());
}
@Test
public void testRateLimitedToasts_windowsRemoved() throws Exception {
final String testPackage = "testPackageName";
assertEquals(0, mService.mToastQueue.size());
mService.isSystemUid = false;
setToastRateIsWithinQuota(false); // rate limit reached
setIfPackageHasPermissionToAvoidToastRateLimiting(testPackage, false);
setAppInForegroundForToasts(mUid, false);
// package is not suspended
when(mPackageManager.isPackageSuspendedForUser(testPackage, UserHandle.getUserId(mUid)))
.thenReturn(false);
Binder token = new Binder();
INotificationManager nmService = (INotificationManager) mService.mService;
nmService.enqueueTextToast(testPackage, token, "Text", 2000, 0, null);
// window token was added when enqueued
ArgumentCaptor<Binder> binderCaptor =
ArgumentCaptor.forClass(Binder.class);
verify(mWindowManagerInternal).addWindowToken(binderCaptor.capture(),
eq(TYPE_TOAST), anyInt(), eq(null));
// but never shown
verify(mStatusBar, times(0))
.showToast(anyInt(), any(), any(), any(), any(), anyInt(), any());
// and removed when rate limited
verify(mWindowManagerInternal)
.removeWindowToken(eq(binderCaptor.getValue()), eq(true), anyInt());
}
@Test
public void backgroundSystemCustomToast_callsSetProcessImportantAsForegroundForToast() throws
Exception {