| commit | f2464cdd8b5cf6ce5513e39f8bd02f19ee58b142 | [log] [tgz] |
|---|---|---|
| author | Trevor Radcliffe <tradical@google.com> | Mon Mar 21 18:01:28 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 21 18:01:28 2022 +0000 |
| tree | 651497ae31f2c4ad4c880a93417c1d322542e1e4 | |
| parent | 15abda616ff929aed800ed952e5d1982923160be [diff] | |
| parent | 7cf78d3709e9d330bf35b19dbdd777ddd3729349 [diff] |
Convert messaging to Soong am: d29da0298e am: 6a69f6ba16 am: 7cf78d3709 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2018480 Change-Id: I615c2c119b306613e3801eb26ab7a8b452933cf4
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b25ff16..fffcdab 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml
@@ -47,6 +47,7 @@ <uses-permission android:name="android.permission.CALL_PHONE" /> <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> + <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <!-- Optional features --> <uses-feature android:name="android.hardware.camera" android:required="false" />
diff --git a/src/com/android/messaging/util/MediaMetadataRetrieverWrapper.java b/src/com/android/messaging/util/MediaMetadataRetrieverWrapper.java index b1078d1..1a93e9d 100644 --- a/src/com/android/messaging/util/MediaMetadataRetrieverWrapper.java +++ b/src/com/android/messaging/util/MediaMetadataRetrieverWrapper.java
@@ -74,7 +74,7 @@ public void release() { try { mRetriever.release(); - } catch (RuntimeException e) { + } catch (RuntimeException | IOException e) { LogUtil.e(LogUtil.BUGLE_TAG, "MediaMetadataRetriever.release failed", e); } }