aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-05-19 02:54:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-19 02:54:52 +0000
commit172523ca907154ad85473e0d43ad2820917b970f (patch)
tree08aaccf8fde3dc86be6785b36e8729cb56e9b47e
parent63330d1d3a5b62a07ca0a275036073e687bb9727 (diff)
parent17c683f34270254e7aa2805554f3779312e6d9d0 (diff)
downloadTV-android14-gsi.tar.gz
Snap for 10162339 from 77a08b55aef105fbd6793cbcb9f94543d71b7bef to udc-release am: 17c683f342android14-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TV/+/23338710 Change-Id: I0a6556fc945e6294eb6f0e1ce6b05905b25ecf12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--src/com/android/tv/MainActivity.java2
-rw-r--r--src/com/android/tv/receiver/AudioCapabilitiesReceiver.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/tv/MainActivity.java b/src/com/android/tv/MainActivity.java
index d005cdd7..cea293de 100644
--- a/src/com/android/tv/MainActivity.java
+++ b/src/com/android/tv/MainActivity.java
@@ -867,7 +867,7 @@ public class MainActivity extends Activity
mMainDurationTimer.start();
applyParentalControlSettings();
- registerReceiver(mBroadcastReceiver, SYSTEM_INTENT_FILTER);
+ registerReceiver(mBroadcastReceiver, SYSTEM_INTENT_FILTER, Context.RECEIVER_EXPORTED);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
Intent notificationIntent = new Intent(this, NotificationService.class);
diff --git a/src/com/android/tv/receiver/AudioCapabilitiesReceiver.java b/src/com/android/tv/receiver/AudioCapabilitiesReceiver.java
index 5fa7606d..9578e243 100644
--- a/src/com/android/tv/receiver/AudioCapabilitiesReceiver.java
+++ b/src/com/android/tv/receiver/AudioCapabilitiesReceiver.java
@@ -67,7 +67,8 @@ public final class AudioCapabilitiesReceiver {
}
public void register() {
- mContext.registerReceiver(mReceiver, new IntentFilter(AudioManager.ACTION_HDMI_AUDIO_PLUG));
+ mContext.registerReceiver(mReceiver, new IntentFilter(AudioManager.ACTION_HDMI_AUDIO_PLUG),
+ Context.RECEIVER_EXPORTED);
}
public void unregister() {