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

Commit fdc44659 authored by Yabin Huang's avatar Yabin Huang
Browse files

resolve merge conflicts of 715acea3 to sc-v2-dev-plus-aosp 

Fixes: 191760821
Bug: 182842046
Test: no test

Change-Id: I7ce644465aacb68eb314c9b2690e4eb14598432c
parents 822203f6 715acea3

services/core/java/com/android/server/policy/LegacyGlobalActions.java

+3 −0
Original line number Diff line number Diff line
@@ -135,6 +135,9 @@ class LegacyGlobalActions implements DialogInterface.OnDismissListener, DialogIn 
        filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);

        filter.addAction(Intent.ACTION_SCREEN_OFF);

        filter.addAction(TelephonyManager.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED);

        // By default CLOSE_SYSTEM_DIALOGS broadcast is sent only for current user, which is user

        // 10 on devices with headless system user enabled.

        // In order to receive the broadcast, register the broadcast receiver with UserHandle.ALL.

        context.registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, filter, null, null);



        mHasTelephony =