commit 85780731d574e8a35991e56245680459b73b0179
author Xin Li <delphij@google.com> Tue Aug 16 19:08:23 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 16 19:08:23 2022 +0000
tree b6f1189a3fc984d264f6f78a76d14e4480ff67b0
parent 9adec7503b89691aa7e9638525e156516288b433
parent 818f0600d5979d2a1805cc515ad5d5da6ecbc8f3

Merge "DO NOT MERGE - Merge Android 13"

src/com/android/camera/GalleryPicker.java

diff --git a/src/com/android/camera/GalleryPicker.java b/src/com/android/camera/GalleryPicker.java
index 2f29691..a7d0655 100644
--- a/src/com/android/camera/GalleryPicker.java
+++ b/src/com/android/camera/GalleryPicker.java
@@ -282,7 +282,8 @@
         intentFilter.addAction(Intent.ACTION_MEDIA_EJECT);
         intentFilter.addDataScheme("file");
 
-        registerReceiver(mReceiver, intentFilter);
+        registerReceiver(mReceiver, intentFilter,
+                Context.RECEIVER_EXPORTED_UNAUDITED);
 
         getContentResolver().registerContentObserver(
                 MediaStore.Images.Media.EXTERNAL_CONTENT_URI,

src/com/android/camera/ImageGallery.java

diff --git a/src/com/android/camera/ImageGallery.java b/src/com/android/camera/ImageGallery.java
index c4bdb84..bc050c7 100644
--- a/src/com/android/camera/ImageGallery.java
+++ b/src/com/android/camera/ImageGallery.java
@@ -467,7 +467,8 @@
                 }
             }
         };
-        registerReceiver(mReceiver, intentFilter);
+        registerReceiver(mReceiver, intentFilter,
+                Context.RECEIVER_EXPORTED_UNAUDITED);
         rebake(false, ImageManager.isMediaScannerScanning(
                 getContentResolver()));
     }