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

Replace AppGlobals @hide APIs

Browse Source 
Connectivity service module is using a AppGlobals @hide API but
it's not able to call after CS become a mainline module. Thus,
replace it with similar System API.

Bug: 170593746
Test: atest FrameworksNetTests
Test: atest HostsideVpnTests
Change-Id: I5ee3005e50640b186e7a0a2e3dc8dd51ffaf273b
This commit is contained in:
paulhu
2020-10-22 21:39:22 +08:00
parent 3c3baf163a
commit 7adf71f697
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

@@ -31,7 +31,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;
@@ -1330,16 +1329,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);
}