From df28c2b1612c4851a3a2c51271d10072867f3bd4 Mon Sep 17 00:00:00 2001 From: chiachangwang Date: Tue, 5 Jul 2022 09:20:13 +0000 Subject: Update method visibility for testing Remove VisibleForTesting for onUserStarted, onPackageRemoved and onPackageAdded because it's not necessary now. Bug: 230548427 Test: m ; atest FrameworksNetTests Change-Id: I531feb457bc59dc9969d93311654523f3e6f5270 --- services/core/java/com/android/server/VpnManagerService.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/VpnManagerService.java b/services/core/java/com/android/server/VpnManagerService.java index 07b6843b2feb..c9a420eabbd8 100644 --- a/services/core/java/com/android/server/VpnManagerService.java +++ b/services/core/java/com/android/server/VpnManagerService.java @@ -769,8 +769,7 @@ public class VpnManagerService extends IVpnManager.Stub { } }; - @VisibleForTesting - void onUserStarted(int userId) { + private void onUserStarted(int userId) { synchronized (mVpns) { Vpn userVpn = mVpns.get(userId); if (userVpn != null) { @@ -854,8 +853,7 @@ public class VpnManagerService extends IVpnManager.Stub { } } - @VisibleForTesting - void onPackageRemoved(String packageName, int uid, boolean isReplacing) { + private void onPackageRemoved(String packageName, int uid, boolean isReplacing) { if (TextUtils.isEmpty(packageName) || uid < 0) { Log.wtf(TAG, "Invalid package in onPackageRemoved: " + packageName + " | " + uid); return; @@ -878,8 +876,7 @@ public class VpnManagerService extends IVpnManager.Stub { } } - @VisibleForTesting - void onPackageAdded(String packageName, int uid, boolean isReplacing) { + private void onPackageAdded(String packageName, int uid, boolean isReplacing) { if (TextUtils.isEmpty(packageName) || uid < 0) { Log.wtf(TAG, "Invalid package in onPackageAdded: " + packageName + " | " + uid); return; -- cgit v1.2.3-59-g8ed1b