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

Merge "Replace AppGlobals @hide APIs"

Browse Source
This commit is contained in:
Paul Hu
2020-11-11 05:25:03 +00:00
committed by Gerrit Code Review
parent 5753a34e67 7adf71f697
commit feb3a2ee1b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -33,7 +33,6 @@ import android.Manifest;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.UserIdInt; import android.annotation.UserIdInt;
import android.app.AppGlobals;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationManager; import android.app.NotificationManager;
@@ -1333,16 +1332,17 @@ public class Vpn {
// Restricted users are not allowed to create VPNs, they are tied to Owner // Restricted users are not allowed to create VPNs, they are tied to Owner
enforceNotRestrictedUser(); enforceNotRestrictedUser();
ResolveInfo info = AppGlobals.getPackageManager().resolveService(intent, final PackageManager packageManager = mUserIdContext.getPackageManager();
null, 0, mUserId); if (packageManager == null) {
throw new UnsupportedOperationException("Cannot get PackageManager.");
}
final ResolveInfo info = packageManager.resolveService(intent, 0 /* flags */);
if (info == null) { if (info == null) {
throw new SecurityException("Cannot find " + config.user); throw new SecurityException("Cannot find " + config.user);
} }
if (!BIND_VPN_SERVICE.equals(info.serviceInfo.permission)) { if (!BIND_VPN_SERVICE.equals(info.serviceInfo.permission)) {
throw new SecurityException(config.user + " does not require " + BIND_VPN_SERVICE); throw new SecurityException(config.user + " does not require " + BIND_VPN_SERVICE);
} }
} catch (RemoteException e) {
throw new SecurityException("Cannot find " + config.user);
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);
} }