Merge 15b320f57cefc1b78e6c69294e75a56f395e529a on remote branch
Change-Id: Ia84f63719b3870e4de6c6eda87af93a437daf767
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,
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()));
}