| commit | ed04b865bbe7b21718676176c57f1e2f44c04a9d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <[email protected]> | Thu Mar 24 20:08:02 2022 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Thu Mar 24 20:08:02 2022 +0000 |
| tree | 1d1b52a73f0fb5bb485c1a103cd59b1268bbb4be | |
| parent | f2464cdd8b5cf6ce5513e39f8bd02f19ee58b142 [diff] | |
| parent | 004f20dc0cb194f68d6e4e5431d774dfc55576b0 [diff] |
Merge "Correct APNs for Carolina West Wireless" am: fdd5746132 am: 5927d48424 am: 004f20dc0c Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2021021 Change-Id: I0fc636aa75c5418cd2c1812705d77419732f2fa6
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); } }