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

Commit 15221cbc authored by Michael Groover's avatar Michael Groover Committed by Automerger Merge Worker
Browse files

Merge "Add a flag to export LOCKDOWN_RESET receiver in VpnManagerService" am:... 

Merge "Add a flag to export LOCKDOWN_RESET receiver in VpnManagerService" am: 5ce00f02 am: 3af5f0c1 am: 02dc008d am: 966b5c7f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845997

Change-Id: I5b60e24de19cad0b7e003dd8438380cb6d8fb28a
parents 01eb71be 966b5c7f

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -681,7 +681,7 @@ public class VpnManagerService extends IVpnManager.Stub { 
        intentFilter = new IntentFilter();

        intentFilter = new IntentFilter();

        intentFilter.addAction(LockdownVpnTracker.ACTION_LOCKDOWN_RESET);

        intentFilter.addAction(LockdownVpnTracker.ACTION_LOCKDOWN_RESET);

        mUserAllContext.registerReceiver(

        mUserAllContext.registerReceiver(

                mIntentReceiver, intentFilter, NETWORK_STACK, mHandler);

                mIntentReceiver, intentFilter, NETWORK_STACK, mHandler, Context.RECEIVER_EXPORTED);

    }

    }





    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {

    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {