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

Commit f67921a4 authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Replace AppGlobals @hide APIs" am: feb3a2ee am: be8e7530

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

Change-Id: Ie883a4bf8866b0ae7d3781d79eca62f71c28635f
parents 2c2b8ff2 be8e7530
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.Manifest;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.app.AppGlobals;
import android.app.AppOpsManager;
import android.app.Notification;
import android.app.NotificationManager;
@@ -1333,16 +1332,17 @@ public class Vpn {
            // Restricted users are not allowed to create VPNs, they are tied to Owner
            enforceNotRestrictedUser();

            ResolveInfo info = AppGlobals.getPackageManager().resolveService(intent,
                    null, 0, mUserId);
            final PackageManager packageManager = mUserIdContext.getPackageManager();
            if (packageManager == null) {
                throw new UnsupportedOperationException("Cannot get PackageManager.");
            }
            final ResolveInfo info = packageManager.resolveService(intent, 0 /* flags */);
            if (info == null) {
                throw new SecurityException("Cannot find " + config.user);
            }
            if (!BIND_VPN_SERVICE.equals(info.serviceInfo.permission)) {
                throw new SecurityException(config.user + " does not require " + BIND_VPN_SERVICE);
            }
        } catch (RemoteException e) {
            throw new SecurityException("Cannot find " + config.user);
        } finally {
            Binder.restoreCallingIdentity(token);
        }