From 84a5d0d52de2068725aa1c6b18212edfca7bb4b6 Mon Sep 17 00:00:00 2001 From: paulhu Date: Wed, 25 Nov 2020 15:04:31 +0800 Subject: [PATCH] Address leftover comments Address leftover comments on aosp/1458063 and aosp/1470942. Bug: 170593746 Test: atest FrameworksNetTests Change-Id: If23a791731ca2034429a14c869902363dd657248 --- services/core/java/com/android/server/connectivity/Vpn.java | 2 +- .../android/server/connectivity/MultipathPolicyTrackerTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index b28edc9eba13c..71bb50b5d472f 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -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) { diff --git a/tests/net/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java b/tests/net/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java index c53462cfb0b2a..950d7163c78a0 100644 --- a/tests/net/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java +++ b/tests/net/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java @@ -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);