commit d72e928dea3a6305de87deae234ed92200799260
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Sep 26 08:40:46 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 26 08:40:46 2023 +0000
tree 58aa7dddb7b0074a391eb15a4f1d386e9b45aac1
parent b0f705240dba285ae9fbb65019da580f74ad74e0
parent 20cb93aa5db86244c8926c91220bfdc52b4e1f66

Merge "Add QUERY_ALL_PACKAGES to FrameworksNetTestsLib" into main am: 20cb93aa5d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2756186

Change-Id: I494d15ba85429177f3b96993779db1264aea04f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/unit/AndroidManifest.xml

diff --git a/tests/unit/AndroidManifest.xml b/tests/unit/AndroidManifest.xml
index 5d4bdf7..2853f31 100644
--- a/tests/unit/AndroidManifest.xml
+++ b/tests/unit/AndroidManifest.xml
@@ -49,6 +49,9 @@
     <uses-permission android:name="android.permission.NETWORK_FACTORY" />
     <uses-permission android:name="android.permission.NETWORK_STATS_PROVIDER" />
     <uses-permission android:name="android.permission.CONTROL_OEM_PAID_NETWORK_PREFERENCE" />
+    <!-- Workaround for flakes where the launcher package is not found despite the <queries> tag
+         below (b/286550950). -->
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
 
     <!-- Declare the intent that the test intends to query. This is necessary for
          UiDevice.getLauncherPackageName which is used in NetworkNotificationManagerTest