commit cda9c3e682ca1182643dbe1a50823d95e75f0028
author Chiachang Wang <chiachangwang@google.com> Mon Jul 11 01:48:45 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 11 01:48:45 2022 +0000
tree b6bb61d5f3cccb7eee2a9a1da71d34fc30c4a6c6
parent 0116bc51f448425c649ffef2b8a2923edeeb2296
parent 11781f84b69cd09c765640d286248b314003d560

Merge "Verify calling thread for intent receiver" am: 11781f84b6

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

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

tests/unit/java/com/android/server/VpnManagerServiceTest.java

diff --git a/tests/unit/java/com/android/server/VpnManagerServiceTest.java b/tests/unit/java/com/android/server/VpnManagerServiceTest.java
index 164f825..c814cc5 100644
--- a/tests/unit/java/com/android/server/VpnManagerServiceTest.java
+++ b/tests/unit/java/com/android/server/VpnManagerServiceTest.java
@@ -231,4 +231,14 @@
     private void onPackageRemoved(String packageName, int uid, boolean isReplacing) {
         onPackageRemoved(packageName, UserHandle.USER_SYSTEM, uid, isReplacing);
     }
+
+    @Test
+    public void testReceiveIntentFromNonHandlerThread() {
+        assertThrows(IllegalStateException.class, () ->
+                mIntentReceiver.onReceive(mContext, buildIntent(Intent.ACTION_PACKAGE_REMOVED,
+                        PKGS[0], UserHandle.USER_SYSTEM, PKG_UIDS[0], true /* isReplacing */)));
+
+        assertThrows(IllegalStateException.class, () ->
+                mUserPresentReceiver.onReceive(mContext, new Intent(Intent.ACTION_USER_PRESENT)));
+    }
 }