From 3377c4eeba9c73c2a7d39b28895f71a0f9a8a6f3 Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Fri, 1 Apr 2022 14:34:00 -0400
Subject: [PATCH] Fix unregisterReceiver in ClipboardOverlayController

We are registering broadcasts using BroadcastDispatcher, so we should
use that to unregister.

Test: atest FrameworksCoreTests:ChooserActivityTest
Test: atest SystemUITests
Fixes 227760347

Change-Id: Ic84140671214787ac3a44fdb9ebb54e88ac6eb7c
---
 .../systemui/clipboardoverlay/ClipboardOverlayController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java
index 29cdf99ed4e5..3ad53366d4a5 100644
--- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java
+++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java
@@ -502,11 +502,11 @@ public class ClipboardOverlayController {
             mWindowManager.removeViewImmediate(decorView);
         }
         if (mCloseDialogsReceiver != null) {
-            mContext.unregisterReceiver(mCloseDialogsReceiver);
+            mBroadcastDispatcher.unregisterReceiver(mCloseDialogsReceiver);
             mCloseDialogsReceiver = null;
         }
         if (mScreenshotReceiver != null) {
-            mContext.unregisterReceiver(mScreenshotReceiver);
+            mBroadcastDispatcher.unregisterReceiver(mScreenshotReceiver);
             mScreenshotReceiver = null;
         }
         if (mInputEventReceiver != null) {