diff options
| author | Paul Hu <paulhu@google.com> | 2019-05-14 04:06:04 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-14 04:06:04 -0700 |
| commit | 9144bdf0e16a8fd8016a1b2b2e3cb09e783b2554 (patch) | |
| tree | c94fd80ea9b50a50948b597c66f93aea937f4283 | |
| parent | 3af50a60332f002e80e6b7df827ffb7bb04ffc9e (diff) | |
| parent | cfcbda3345580641ec75f0ec0dfefd7047fe1d3d (diff) | |
| download | base-9144bdf0e16a8fd8016a1b2b2e3cb09e783b2554.tar.gz | |
Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission"
am: cfcbda3345
Change-Id: I065b5403d2f89d158e76f63c9b125ad30e603633
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 562199aa775b..b3b5e45496ac 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -3495,7 +3495,8 @@ public class ConnectivityService extends IConnectivityManager.Stub */ @Override public void startCaptivePortalAppInternal(Network network, Bundle appExtras) { - mContext.checkCallingOrSelfPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK); + mContext.enforceCallingOrSelfPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, + "ConnectivityService"); final Intent appIntent = new Intent(ConnectivityManager.ACTION_CAPTIVE_PORTAL_SIGN_IN); appIntent.putExtras(appExtras); |