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

Commit 9144bdf0 authored by Paul Hu's avatar Paul Hu Committed by android-build-merger
Browse files

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

am: cfcbda33

Change-Id: I065b5403d2f89d158e76f63c9b125ad30e603633
parents 3af50a60 cfcbda33

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -3495,7 +3495,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
     */

     */

    @Override

    @Override

    public void startCaptivePortalAppInternal(Network network, Bundle appExtras) {

    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);

        final Intent appIntent = new Intent(ConnectivityManager.ACTION_CAPTIVE_PORTAL_SIGN_IN);

        appIntent.putExtras(appExtras);

        appIntent.putExtras(appExtras);