diff options
| author | Benedict Wong <benedictwong@google.com> | 2021-03-24 03:00:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-24 03:00:52 +0000 |
| commit | c475dcfc45ebb369f1d14b331930a87419ed4eab (patch) | |
| tree | 34da5590eb79226ba593f6af90743ffef2c60c55 /core/java | |
| parent | 3315bd2c59f45f42c8f22bd8587ae45b32f1178f (diff) | |
| parent | 55ed7ee12b69c4d9c5f86ba7122b8bd0bb6d5577 (diff) | |
Merge "Check carrier privilege permissions with package name" am: f1a81b04b1 am: cc103b3c7a am: 55ed7ee12b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649652
Change-Id: I236f500d5428f8d370b41d94c386ac20823742a8
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/vcn/IVcnManagementService.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/net/vcn/VcnManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/net/vcn/IVcnManagementService.aidl b/core/java/android/net/vcn/IVcnManagementService.aidl index 6a3cb42ed75d..5b79f7311b6d 100644 --- a/core/java/android/net/vcn/IVcnManagementService.aidl +++ b/core/java/android/net/vcn/IVcnManagementService.aidl @@ -29,7 +29,7 @@ import android.os.ParcelUuid; */ interface IVcnManagementService { void setVcnConfig(in ParcelUuid subscriptionGroup, in VcnConfig config, in String opPkgName); - void clearVcnConfig(in ParcelUuid subscriptionGroup); + void clearVcnConfig(in ParcelUuid subscriptionGroup, in String opPkgName); void addVcnUnderlyingNetworkPolicyListener(in IVcnUnderlyingNetworkPolicyListener listener); void removeVcnUnderlyingNetworkPolicyListener(in IVcnUnderlyingNetworkPolicyListener listener); diff --git a/core/java/android/net/vcn/VcnManager.java b/core/java/android/net/vcn/VcnManager.java index c0189e2202d2..abd41dacdeb6 100644 --- a/core/java/android/net/vcn/VcnManager.java +++ b/core/java/android/net/vcn/VcnManager.java @@ -154,7 +154,7 @@ public class VcnManager { requireNonNull(subscriptionGroup, "subscriptionGroup was null"); try { - mService.clearVcnConfig(subscriptionGroup); + mService.clearVcnConfig(subscriptionGroup, mContext.getOpPackageName()); } catch (ServiceSpecificException e) { throw new IOException(e); } catch (RemoteException e) { |