aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHongguang Chen <hgchen@google.com>2023-05-18 01:05:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-18 01:05:54 +0000
commit4a8ccc411514f9f96c26e896e2931673c2246831 (patch)
tree08aaccf8fde3dc86be6785b36e8729cb56e9b47e
parent7d698dc0f98b266667f12b06a4444a4ae993302e (diff)
parent77a08b55aef105fbd6793cbcb9f94543d71b7bef (diff)
downloadTV-4a8ccc411514f9f96c26e896e2931673c2246831.tar.gz
Add RECEIVER_EXPORTED to avoid crash am: 77a08b55ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TV/+/23302491 Change-Id: I615cbfe75a362b1b6b510c2cae1c1ac7d4751bc8 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() {