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

Commit 7a4feb51 authored by Sally Yuen's avatar Sally Yuen Committed by Automerger Merge Worker
Browse files

Merge "Add SELF permission to SystemActions receiver" into rvc-dev am: b0d96709 

Change-Id: I3e0b20421d488024bcf16382143f74978f049a96
parents ca6d8f95 b0d96709

packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java

+8 −1
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ public class SystemActions extends SystemUI { 
    public static final int SYSTEM_ACTION_ID_ACCESSIBILITY_SHORTCUT =

            AccessibilityService.GLOBAL_ACTION_ACCESSIBILITY_SHORTCUT; // 13



    private static final String PERMISSION_SELF = "com.android.systemui.permission.SELF";



    private Recents mRecents;

    private StatusBar mStatusBar;

    private SystemActionsBroadcastReceiver mReceiver;
@@ -147,7 +149,11 @@ public class SystemActions extends SystemUI { 


    @Override

    public void start() {

        mContext.registerReceiverForAllUsers(mReceiver, mReceiver.createIntentFilter(), null, null);

        mContext.registerReceiverForAllUsers(

                mReceiver,

                mReceiver.createIntentFilter(),

                PERMISSION_SELF,

                null);

        registerActions();

    }
@@ -397,6 +403,7 @@ public class SystemActions extends SystemUI { 
                case INTENT_ACTION_ACCESSIBILITY_BUTTON_CHOOSER:

                case INTENT_ACTION_ACCESSIBILITY_SHORTCUT: {

                    Intent intent = new Intent(intentAction);

                    intent.setPackage(context.getPackageName());

                    return PendingIntent.getBroadcast(context, 0, intent, 0);

                }

                default: