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

Commit b91a2d41 authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Address leftover comments" am: 1ddb4889 am: 5c19cb00 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03a2140e5574088fd0768e3ac8e3f47e54c98b6d
parents 845bfdd0 5c19cb00

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

+1 −1
Original line number Diff line number Diff line
@@ -1253,7 +1253,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);