[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1ee3a18167 -s ours am: 5c7e5e1755 -s ours
am skip reason: Merged-In Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a with SHA-1 004f20dc0c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17544832
Change-Id: I5386b5d8ce49cb196bd6ba53233e2720ebfe8425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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);
}
}
diff --git a/src/com/android/messaging/util/PhoneUtils.java b/src/com/android/messaging/util/PhoneUtils.java
index 671c65e..08889b8 100644
--- a/src/com/android/messaging/util/PhoneUtils.java
+++ b/src/com/android/messaging/util/PhoneUtils.java
@@ -26,7 +26,6 @@
import android.net.ConnectivityManager;
import android.provider.Settings;
import android.provider.Telephony;
-import androidx.collection.ArrayMap;
import android.telephony.PhoneNumberUtils;
import android.telephony.SmsManager;
import android.telephony.SubscriptionInfo;
@@ -34,14 +33,18 @@
import android.telephony.TelephonyManager;
import android.text.TextUtils;
+import androidx.collection.ArrayMap;
+import androidx.core.os.BuildCompat;
+
import com.android.messaging.Factory;
import com.android.messaging.R;
import com.android.messaging.datamodel.data.ParticipantData;
import com.android.messaging.sms.MmsSmsUtils;
+
import com.google.i18n.phonenumbers.NumberParseException;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -369,6 +372,9 @@
@Override
@SuppressWarnings("deprecation")
public boolean isDataRoamingEnabled() {
+ if (BuildCompat.isAtLeastT()) {
+ return mTelephonyManager.isDataRoamingEnabled();
+ }
boolean dataRoamingEnabled = false;
final ContentResolver cr = mContext.getContentResolver();
if (OsUtil.isAtLeastJB_MR1()) {