summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Charles Lombardo2023-09-17 17:20:58 -0400
committerGravatar Charles Lombardo2023-09-17 17:33:33 -0400
commite3c546a1edb893539094fff6284ee0ebce269a64 (patch)
treed160628b8d628dd096d6d55e617356c6b3f3dc76 /src
parentMerge pull request #11523 from t895/shader-workers (diff)
downloadyuzu-e3c546a1edb893539094fff6284ee0ebce269a64.tar.gz
yuzu-e3c546a1edb893539094fff6284ee0ebce269a64.tar.xz
yuzu-e3c546a1edb893539094fff6284ee0ebce269a64.zip
android: Export PiP receiver on API 33 and later
Could cause crashes on API 33+ devices
Diffstat (limited to 'src')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
index d4ae39661..e96a2059b 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
@@ -3,6 +3,7 @@
3 3
4package org.yuzu.yuzu_emu.activities 4package org.yuzu.yuzu_emu.activities
5 5
6import android.annotation.SuppressLint
6import android.app.Activity 7import android.app.Activity
7import android.app.PendingIntent 8import android.app.PendingIntent
8import android.app.PictureInPictureParams 9import android.app.PictureInPictureParams
@@ -397,6 +398,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
397 } 398 }
398 } 399 }
399 400
401 @SuppressLint("UnspecifiedRegisterReceiverFlag")
400 override fun onPictureInPictureModeChanged( 402 override fun onPictureInPictureModeChanged(
401 isInPictureInPictureMode: Boolean, 403 isInPictureInPictureMode: Boolean,
402 newConfig: Configuration 404 newConfig: Configuration
@@ -409,7 +411,11 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
409 addAction(actionMute) 411 addAction(actionMute)
410 addAction(actionUnmute) 412 addAction(actionUnmute)
411 }.also { 413 }.also {
412 registerReceiver(pictureInPictureReceiver, it) 414 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
415 registerReceiver(pictureInPictureReceiver, it, RECEIVER_EXPORTED)
416 } else {
417 registerReceiver(pictureInPictureReceiver, it)
418 }
413 } 419 }
414 } else { 420 } else {
415 try { 421 try {