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

Commit 37accfd8 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge changes from topics "RefactorIR", "appExclusionPrefix",... 

Merge changes from topics "RefactorIR", "appExclusionPrefix", "reStartVpnProfile" am: 09940f74 am: 161cc7e5

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



Change-Id: Ieefa1be81e90328d7cc295e078840c4114c42ec2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bc3fcb6d 161cc7e5

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;