From 05a043c911a4c7e00f2f12af0cc82a19b1c8efce Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Mon, 15 Nov 2021 14:33:54 -0800 Subject: [PATCH] Fix a security issue This broadcast was only for a prototype so no harm to remove the receiver. Test: treehugger Bug: 202756848 Bug: 173386799 Change-Id: Ia496570f4209e4019ecddd9731b6b9c303740f85 --- .../com/android/wm/shell/bubbles/BubbleController.java | 3 +-- .../android/systemui/statusbar/phone/StatusBar.java | 10 ---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java index caa532761f1c5..ec59fad3e95b5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java @@ -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"; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index cbaa4683c3641..86a9c97df8227 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -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) {