Merge "Fix licenses and license texts." am: 415b6c98ba am: 7d558418cb am: 84277a4f3d am: edf435aef1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1964782
Change-Id: Ic62dfece8efaf873df4f0265ef82075353b2bfd8
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 322ab0d..dc96854 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1537,7 +1537,8 @@
intentFilter.addAction(Intent.ACTION_MEDIA_SCANNER_FINISHED);
intentFilter.addAction(Intent.ACTION_MEDIA_CHECKING);
intentFilter.addDataScheme("file");
- registerReceiver(mReceiver, intentFilter);
+ registerReceiver(mReceiver, intentFilter,
+ Context.RECEIVER_EXPORTED_UNAUDITED);
mDidRegister = true;
}
diff --git a/src/com/android/camera/Thumbnail.java b/src/com/android/camera/Thumbnail.java
index 7775c37..04c57af 100644
--- a/src/com/android/camera/Thumbnail.java
+++ b/src/com/android/camera/Thumbnail.java
@@ -278,7 +278,7 @@
} finally {
try {
retriever.release();
- } catch (RuntimeException ex) {
+ } catch (RuntimeException | IOException ex) {
// Ignore failures while cleaning up.
}
}
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index b2626ed..fe98acd 100755
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -864,7 +864,8 @@
intentFilter.addAction(Intent.ACTION_MEDIA_SCANNER_FINISHED);
intentFilter.addDataScheme("file");
mReceiver = new MyBroadcastReceiver();
- registerReceiver(mReceiver, intentFilter);
+ registerReceiver(mReceiver, intentFilter,
+ Context.RECEIVER_EXPORTED_UNAUDITED);
mStorageSpace = Storage.getAvailableSpace();
mHandler.postDelayed(new Runnable() {