commit a606a2937b321dfc841ac48ef6cc295ced1f510d
author Michal Karpinski <mkarpinski@google.com> Sat Jan 12 17:29:52 2019 +0000
committer Michal Karpinski <mkarpinski@google.com> Mon Jan 14 16:00:21 2019 +0000
tree 439679cfd844845f79cf85d8be3b5e9062ba6707
parent efad1da2f1559decf1d8ed41d353dfa338af0a92

Don't count toasts as visible windows
in WMS#isAnyWindowVisibleForUid() (now in RootWindowContainer)

Apps could post a toast (or many in a row for that matter) to
trivially bypass the isUidForeground() check.

Bug: 110956953
Test: atest WmTests:ActivityStarterTests
      atest WmTests:RootWindowContainerTests
Test: manual
Change-Id: Ice6571264c35fbf7d4446a5f67a4c44c84d0f9f0

services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java

diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
index 7a6b2b5..ec88718 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
@@ -643,10 +643,10 @@
             boolean hasForegroundActivities, boolean callerIsRecents,
             boolean callerIsTempWhitelisted) {
         // window visibility
-        doReturn(callingUidHasVisibleWindow).when(mService.mWindowManager).isAnyWindowVisibleForUid(
-                callingUid);
-        doReturn(realCallingUidHasVisibleWindow).when(mService.mWindowManager)
-                .isAnyWindowVisibleForUid(realCallingUid);
+        doReturn(callingUidHasVisibleWindow).when(mService.mWindowManager.mRoot)
+                .isAnyNonToastWindowVisibleForUid(callingUid);
+        doReturn(realCallingUidHasVisibleWindow).when(mService.mWindowManager.mRoot)
+                .isAnyNonToastWindowVisibleForUid(realCallingUid);
         // process importance
         doReturn(callingUidProcState).when(mService).getUidStateLocked(callingUid);
         doReturn(realCallingUidProcState).when(mService).getUidStateLocked(realCallingUid);