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

Commit 33b6f6a1 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 6a6b9eff to... 

Merge "resolve merge conflicts of 6a6b9eff to sc-dev-plus-aosp" into sc-dev-plus-aosp
parents d72f5e60 ab5d8d64

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 =