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

Commit 509a29f8 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Fix a security issue" into sc-v2-dev

parents eca0b750 05a043c9

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+1 −2
Original line number Diff line number Diff line
@@ -111,8 +111,7 @@ public class BubbleController { 


    private static final String TAG = TAG_WITH_CLASS_NAME ? "BubbleController" : TAG_BUBBLES;



    // TODO(b/173386799) keep in sync with Launcher3 and also don't do a broadcast

    public static final String TASKBAR_CHANGED_BROADCAST = "taskbarChanged";

    // TODO(b/173386799) keep in sync with Launcher3, not hooked up to anything

    public static final String EXTRA_TASKBAR_CREATED = "taskbarCreated";

    public static final String EXTRA_BUBBLE_OVERFLOW_OPENED = "bubbleOverflowOpened";

    public static final String EXTRA_TASKBAR_VISIBLE = "taskbarVisible";

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+0 −10
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import static com.android.systemui.statusbar.phone.BarTransitions.MODE_OPAQUE; 
import static com.android.systemui.statusbar.phone.BarTransitions.MODE_SEMI_TRANSPARENT;

import static com.android.systemui.statusbar.phone.BarTransitions.MODE_TRANSPARENT;

import static com.android.systemui.statusbar.phone.BarTransitions.TransitionMode;

import static com.android.wm.shell.bubbles.BubbleController.TASKBAR_CHANGED_BROADCAST;



import android.annotation.Nullable;

import android.app.ActivityManager;
@@ -918,8 +917,6 @@ public class StatusBar extends SystemUI implements 
        mBypassHeadsUpNotifier.setUp();

        if (mBubblesOptional.isPresent()) {

            mBubblesOptional.get().setExpandListener(mBubbleExpandListener);

            IntentFilter filter = new IntentFilter(TASKBAR_CHANGED_BROADCAST);

            mBroadcastDispatcher.registerReceiver(mTaskbarChangeReceiver, filter);

        }



        mKeyguardIndicationController.init();
@@ -4270,13 +4267,6 @@ public class StatusBar extends SystemUI implements 
        }

    };



    BroadcastReceiver mTaskbarChangeReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            mBubblesOptional.ifPresent(bubbles -> bubbles.onTaskbarChanged(intent.getExtras()));

        }

    };



    private final ConfigurationListener mConfigurationListener = new ConfigurationListener() {

        @Override

        public void onConfigChanged(Configuration newConfig) {