From 9041b19e137a60ee3f13bb40022037dbb672bd17 Mon Sep 17 00:00:00 2001 From: Artyom Palvelev Date: Fri, 4 Nov 2022 12:34:59 +0000 Subject: [PATCH] Revert "Add unaudited exported flag to exposed runtime receivers" This reverts commit 0d9f847f763beb8006ee8023f4e9f63e0761a4dd. Reason for revert: failing tests b/257410439 Change-Id: I79f140708b1c78d9a4548a078906db6ab5fefa16 --- .../coretests/src/android/app/activity/LocalReceiver.java | 3 +-- core/tests/coretests/src/android/app/activity/ServiceTest.java | 2 +- .../src/com/android/wm/shell/bubbles/BubbleController.java | 2 +- .../android/systemui/statusbar/policy/SafetyController.java | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/core/tests/coretests/src/android/app/activity/LocalReceiver.java b/core/tests/coretests/src/android/app/activity/LocalReceiver.java index 5ac84f809564d..7f813390552c7 100644 --- a/core/tests/coretests/src/android/app/activity/LocalReceiver.java +++ b/core/tests/coretests/src/android/app/activity/LocalReceiver.java @@ -36,8 +36,7 @@ public class LocalReceiver extends BroadcastReceiver { if (BroadcastTest.BROADCAST_FAIL_REGISTER.equals(intent.getAction())) { resultString = "Successfully registered, but expected it to fail"; try { - context.registerReceiver(this, new IntentFilter("foo.bar"), - Context.RECEIVER_EXPORTED_UNAUDITED); + context.registerReceiver(this, new IntentFilter("foo.bar")); context.unregisterReceiver(this); } catch (ReceiverCallNotAllowedException e) { //resultString = "This is the correct behavior but not yet implemented"; diff --git a/core/tests/coretests/src/android/app/activity/ServiceTest.java b/core/tests/coretests/src/android/app/activity/ServiceTest.java index 3f3d6a3bff347..c89f37db7fed3 100644 --- a/core/tests/coretests/src/android/app/activity/ServiceTest.java +++ b/core/tests/coretests/src/android/app/activity/ServiceTest.java @@ -172,7 +172,7 @@ public class ServiceTest extends TestCase { pidResult.complete(intent.getIntExtra(EXTRA_PID, NOT_STARTED)); mContext.unregisterReceiver(this); } - }, new IntentFilter(ACTION_SERVICE_STARTED), Context.RECEIVER_EXPORTED_UNAUDITED); + }, new IntentFilter(ACTION_SERVICE_STARTED)); serviceTrigger.run(); try { 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 0262d9a9321e8..725b20525bf7e 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 @@ -692,7 +692,7 @@ public class BubbleController implements ConfigurationChangeListener { IntentFilter filter = new IntentFilter(); filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); filter.addAction(Intent.ACTION_SCREEN_OFF); - mContext.registerReceiver(mBroadcastReceiver, filter, Context.RECEIVER_EXPORTED_UNAUDITED); + mContext.registerReceiver(mBroadcastReceiver, filter); } private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SafetyController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SafetyController.java index 9db207ae9e1dc..f3d183ceb45f6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SafetyController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SafetyController.java @@ -78,8 +78,7 @@ public class SafetyController implements synchronized (mListeners) { mListeners.add(listener); if (mListeners.size() == 1) { - mContext.registerReceiver(mPermControllerChangeReceiver, PKG_CHANGE_INTENT_FILTER, - Context.RECEIVER_EXPORTED_UNAUDITED); + mContext.registerReceiver(mPermControllerChangeReceiver, PKG_CHANGE_INTENT_FILTER); mBgHandler.post(() -> { mSafetyCenterEnabled = mSafetyCenterManager.isSafetyCenterEnabled(); listener.onSafetyCenterEnableChanged(isSafetyCenterEnabled());