Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53e2a9b0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 18cb49bb eb20d2a2

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

+2 −1
Original line number Diff line number Diff line
@@ -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);