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

Commit df28c2b1 authored by chiachangwang's avatar chiachangwang
Browse files

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
parent 03f0d124

services/core/java/com/android/server/VpnManagerService.java

+3 −6
Original line number Diff line number Diff line
@@ -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;