diff options
| author | Benedict Wong <benedictwong@google.com> | 2021-03-24 01:51:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-24 01:51:14 +0000 |
| commit | cc103b3c7a1f3b1e1297fcd0893c34c6d6f90ffa (patch) | |
| tree | 5b89542ce1fbea868560fb8b7e80613618dd787a /core/java/android | |
| parent | 52c4c695a88930bc5b9f3b90e8d4fcf497e126c1 (diff) | |
| parent | f1a81b04b16a430213b011fc8da7e1096e66398e (diff) | |
Merge "Check carrier privilege permissions with package name" am: f1a81b04b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649652
Change-Id: I1f6533951cc30f07bc10ad7355ec1833590ca8db
Diffstat (limited to 'core/java/android')
| -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) { |