Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66b5e081 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Clean up unit testing for ConnectivityDiagnostics." am: dc95e019 am:... 

Merge "Clean up unit testing for ConnectivityDiagnostics." am: dc95e019 am: f68f0b14 am: bd48f4f1 am: 9ee80b2a am: 9be9976d

Change-Id: I69470931ef09feb52025462eb4c66f2c1493bf14
parents 88454933 9be9976d

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

+5 −9
Original line number Original line Diff line number Diff line
@@ -6797,15 +6797,11 @@ public class ConnectivityServiceTest { 




        mServiceContext.setPermission(android.Manifest.permission.NETWORK_STACK, PERMISSION_DENIED);

        mServiceContext.setPermission(android.Manifest.permission.NETWORK_STACK, PERMISSION_DENIED);





        try {

        assertFalse(

        assertFalse(

                "Mismatched uid/package name should not pass the location permission check",

                "Mismatched uid/package name should not pass the location permission check",

                mService.checkConnectivityDiagnosticsPermissions(

                mService.checkConnectivityDiagnosticsPermissions(

                        Process.myPid() + 1, Process.myUid() + 1, naiWithoutUid,

                        Process.myPid() + 1, Process.myUid() + 1, naiWithoutUid,

                        mContext.getOpPackageName()));

                        mContext.getOpPackageName()));

        } catch (SecurityException e) {

            fail("checkConnectivityDiagnosticsPermissions shouldn't surface a SecurityException");

        }

    }

    }





    @Test

    @Test