commit cfcbda3345580641ec75f0ec0dfefd7047fe1d3d
author Paul Hu <paulhu@google.com> Tue May 14 10:48:48 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 14 10:48:48 2019 +0000
tree 71017d3b6aa480b0a68c2872df4a6a5a453d2601
parent f1aca7cf4eab94a3bfb737251ab33d4cf4942a7f
parent 9852560e444d199477fe0a72cd7c96f237fb9cab

Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission"

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 562199a..b3b5e45 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3495,7 +3495,8 @@
      */
     @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);