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

Commit 84a5d0d5 authored by paulhu's avatar paulhu
Browse files

Address leftover comments 

Address leftover comments on aosp/1458063 and aosp/1470942.

Bug: 170593746
Test: atest FrameworksNetTests
Change-Id: If23a791731ca2034429a14c869902363dd657248
parent 00995781

services/core/java/com/android/server/connectivity/Vpn.java

+1 −1
Original line number Diff line number Diff line
@@ -1335,7 +1335,7 @@ public class Vpn { 


            final PackageManager packageManager = mUserIdContext.getPackageManager();

            if (packageManager == null) {

                throw new UnsupportedOperationException("Cannot get PackageManager.");

                throw new IllegalStateException("Cannot get PackageManager.");

            }

            final ResolveInfo info = packageManager.resolveService(intent, 0 /* flags */);

            if (info == null) {

tests/net/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ public class MultipathPolicyTrackerTest { 


        when(mContext.getResources()).thenReturn(mResources);

        when(mContext.getApplicationInfo()).thenReturn(new ApplicationInfo());

        // Mock user id to all users that Context#registerReceiver will register with all users too.

        doReturn(UserHandle.ALL.getIdentifier()).when(mUserAllContext).getUserId();

        when(mContext.createContextAsUser(eq(UserHandle.ALL), anyInt()))

                .thenReturn(mUserAllContext);