Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" into qt-dev

2019-05-15 04:38:57 +00:00
parent 18cb49bbab eb20d2a231
commit 53e2a9b0ae
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3497,7 +3497,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);