commit 91af7c65f07ca2e51b8bd9c007a19fdb744416d0
author Cody Kesting <ckesting@google.com> Fri Mar 27 19:09:00 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 27 19:09:00 2020 +0000
tree fb9a6daa6608db676cf9898ef0988e81f014976f
parent e3e18663f9a48b267b4b716224b465a8038a6861
parent 69fad4c7212eb975169bf2efe8aa3b41cb9406b2

Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev

tests/net/java/com/android/server/ConnectivityServiceTest.java

diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index 2f86d2c..83399b8 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -6810,15 +6810,11 @@
 
         mServiceContext.setPermission(android.Manifest.permission.NETWORK_STACK, PERMISSION_DENIED);
 
-        try {
-            assertFalse(
-                    "Mismatched uid/package name should not pass the location permission check",
-                    mService.checkConnectivityDiagnosticsPermissions(
-                            Process.myPid() + 1, Process.myUid() + 1, naiWithoutUid,
-                            mContext.getOpPackageName()));
-        } catch (SecurityException e) {
-            fail("checkConnectivityDiagnosticsPermissions shouldn't surface a SecurityException");
-        }
+        assertFalse(
+                "Mismatched uid/package name should not pass the location permission check",
+                mService.checkConnectivityDiagnosticsPermissions(
+                        Process.myPid() + 1, Process.myUid() + 1, naiWithoutUid,
+                        mContext.getOpPackageName()));
     }
 
     @Test