commit 3ff2753fef403ea9f6cab74c1b241c83ffe5674f
author Xin Li <delphij@google.com> Tue Aug 16 19:08:22 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 16 19:08:22 2022 +0000
tree d6425b0f78acf46ed470daad38e98d3593c3f772
parent edf435aef1384080e1a1107faedea7b236f6ee47
parent 5ae7a9e788d3b3193de4b529ff4907c4051661e8

Merge "DO NOT MERGE - Merge Android 13"

src/com/android/camera/Camera.java

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;
     }
 

src/com/android/camera/Thumbnail.java

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.
             }
         }

src/com/android/camera/VideoCamera.java

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() {