commit b416f47e7adc65987075154ffd1b0703cb2ace48
author Michal Karpinski <mkarpinski@google.com> Thu Jan 24 14:34:28 2019 +0000
committer Michal Karpinski <mkarpinski@google.com> Thu Jan 24 14:34:38 2019 +0000
tree d240ab940d521e33b044075c5c0aa4fb04a0c775
parent bf4595621748a37d3c0ae2d6297dcad9f24cf77d

Whitelist NFC_UID to open activities from background

Bug: 123331369
Bug: 110956953
Test: atest WmTests:ActivityStarterTests
Test: manual
Change-Id: I517a3b33bcc1dfdc8e8769385a76d2f7912fda9a

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 a381023..5a145ad 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
@@ -599,6 +599,10 @@
                 Process.SYSTEM_UID, false, PROCESS_STATE_TOP + 1,
                 UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
                 false, false, false);
+        runAndVerifyBackgroundActivityStartsSubtest("disallowed_nfcUid_notAborted", false,
+                Process.NFC_UID, false, PROCESS_STATE_TOP + 1,
+                UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
+                false, false, false);
         runAndVerifyBackgroundActivityStartsSubtest(
                 "disallowed_callingUidHasVisibleWindow_notAborted", false,
                 UNIMPORTANT_UID, true, PROCESS_STATE_TOP + 1,