Merge "Snap for 9550355 from fd6bc55527d6e441e9361b5a55678f836a068480 to sdk-release" into sdk-release
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()));
}