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

Merge "Add system partition check for vpn dialogs" into klp-dev-plus-aosp

Browse Source
This commit is contained in:
Nick Kralevich
2013-10-21 20:21:15 +00:00
committed by Android (Google) Code Review
parent 10f03972cc 212a195f00
commit 7a670250c9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/connectivity/Vpn.java
View File

@@ -597,10 +597,10 @@ public class Vpn extends BaseNetworkStateTracker {
int appId = UserHandle.getAppId(Binder.getCallingUid());
final long token = Binder.clearCallingIdentity();
try {
// System dialogs are also allowed to control VPN.
// System VPN dialogs are also allowed to control VPN.
PackageManager pm = mContext.getPackageManager();
ApplicationInfo app = pm.getApplicationInfo(VpnConfig.DIALOGS_PACKAGE, 0);
if (appId == app.uid) {
if (((app.flags & ApplicationInfo.FLAG_SYSTEM) != 0) && (appId == app.uid)) {
return;
}
} catch (Exception e) {