Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topics "RefactorIR", "appExclusionPrefix", "reStartVpnProfile" am: 09940f74cb am: 161cc7e565 am: 37accfd817 am: 0f867e50f2 am: f1f5b0174f

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

Change-Id: I2916d251d0f13f8b5502e7cbe3c5740a220f5e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2022-07-11 03:07:31 +00:00
committed by Automerger Merge Worker
parent f28727ccef f1f5b0174f
commit 5bbb11b78f
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/VpnManagerService.java
View File

@@ -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;