diff options
| author | Xin Li <delphij@google.com> | 2022-08-15 22:04:31 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2022-08-15 22:04:31 -0700 |
| commit | 5ae7a9e788d3b3193de4b529ff4907c4051661e8 (patch) | |
| tree | d6425b0f78acf46ed470daad38e98d3593c3f772 | |
| parent | edf435aef1384080e1a1107faedea7b236f6ee47 (diff) | |
| parent | caa160ef243ccc4bb9edee5d03b430fa929cf587 (diff) | |
| download | LegacyCamera-5ae7a9e788d3b3193de4b529ff4907c4051661e8.tar.gz | |
DO NOT MERGE - Merge Android 13
Bug: 242648940
Merged-In: I72b183fc7c8da980d2056bdf84d9425025e6adc5
Change-Id: Iad15b9dfb541f72b0e894f29d86ba6d9de841d57
| -rw-r--r-- | src/com/android/camera/Camera.java | 3 | ||||
| -rw-r--r-- | src/com/android/camera/Thumbnail.java | 2 | ||||
| -rwxr-xr-x | src/com/android/camera/VideoCamera.java | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 322ab0d0..dc96854f 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1537,7 +1537,8 @@ public class Camera extends ActivityBase implements FocusManager.Listener, 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 7775c372..04c57afa 100644 --- a/src/com/android/camera/Thumbnail.java +++ b/src/com/android/camera/Thumbnail.java @@ -278,7 +278,7 @@ public class Thumbnail { } 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 b2626ed2..fe98acd0 100755 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -864,7 +864,8 @@ public class VideoCamera extends ActivityBase 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() { |