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

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

Change-Id: Ieefa1be81e90328d7cc295e078840c4114c42ec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2022-07-11 02:06:39 +00:00
committed by Automerger Merge Worker
parent bc3fcb6db2 161cc7e565
commit 37accfd817
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 private void onUserStarted(int userId) {
void onUserStarted(int userId) {
synchronized (mVpns) { synchronized (mVpns) {
Vpn userVpn = mVpns.get(userId); Vpn userVpn = mVpns.get(userId);
if (userVpn != null) { if (userVpn != null) {
@@ -854,8 +853,7 @@ public class VpnManagerService extends IVpnManager.Stub {
} }
} }
@VisibleForTesting private void onPackageRemoved(String packageName, int uid, boolean isReplacing) {
void onPackageRemoved(String packageName, int uid, boolean isReplacing) {
if (TextUtils.isEmpty(packageName) || uid < 0) { if (TextUtils.isEmpty(packageName) || uid < 0) {
Log.wtf(TAG, "Invalid package in onPackageRemoved: " + packageName + " | " + uid); Log.wtf(TAG, "Invalid package in onPackageRemoved: " + packageName + " | " + uid);
return; return;
@@ -878,8 +876,7 @@ public class VpnManagerService extends IVpnManager.Stub {
} }
} }
@VisibleForTesting private void onPackageAdded(String packageName, int uid, boolean isReplacing) {
void onPackageAdded(String packageName, int uid, boolean isReplacing) {
if (TextUtils.isEmpty(packageName) || uid < 0) { if (TextUtils.isEmpty(packageName) || uid < 0) {
Log.wtf(TAG, "Invalid package in onPackageAdded: " + packageName + " | " + uid); Log.wtf(TAG, "Invalid package in onPackageAdded: " + packageName + " | " + uid);
return; return;