summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2022-08-16 19:08:23 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-08-16 19:08:23 +0000
commit85780731d574e8a35991e56245680459b73b0179 (patch)
treeb6f1189a3fc984d264f6f78a76d14e4480ff67b0
parent9adec7503b89691aa7e9638525e156516288b433 (diff)
parent818f0600d5979d2a1805cc515ad5d5da6ecbc8f3 (diff)
downloadGallery-85780731d574e8a35991e56245680459b73b0179.tar.gz
Merge "DO NOT MERGE - Merge Android 13"main-16k
-rw-r--r--src/com/android/camera/GalleryPicker.java3
-rw-r--r--src/com/android/camera/ImageGallery.java3
2 files changed, 4 insertions, 2 deletions
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 @@ public class GalleryPicker extends NoSearchActivity {
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,
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 @@ public class ImageGallery extends NoSearchActivity implements
}
}
};
- registerReceiver(mReceiver, intentFilter);
+ registerReceiver(mReceiver, intentFilter,
+ Context.RECEIVER_EXPORTED_UNAUDITED);
rebake(false, ImageManager.isMediaScannerScanning(
getContentResolver()));
}