commit 4f47f2c8276a7908937127e42fddded3dd38190c
author Lorenzo Colitti <lorenzo@google.com> Wed May 15 06:26:52 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 15 06:26:52 2019 +0000
tree 67573f44b7343883666bfe56e0a22abd12fe6e68
parent 49ea93861d1bee28c9acee421b11364c401751de
parent 2bebfc2b87698f664575bce04e4a7d1d9844fd98

Merge "Clean up the permission control code in framework" into qt-dev

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 facc299..f12bfc3 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3497,7 +3497,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);