commit 38a2b29427c8dacb553a3cdfa426bb56437df55b
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 17 22:34:05 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 17 22:34:05 2019 +0000
tree 78973c4f242a336ed1fb3f40e9e1e019710401cf
parent 0427b5cef7199e9d6b6a3a0769adb70c86fbb55f
parent f67fc08b4d886e77d7bd790015acd35da4b5bbd1

Merge "Import translations. DO NOT MERGE" into qt-dev

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 6b5319d..3d7a489 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -17,6 +17,7 @@
 package com.android.phone;
 
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+import static android.telephony.data.ApnSetting.TYPE_MMS;
 
 import static com.android.internal.telephony.PhoneConstants.SUBSCRIPTION_KEY;
 
@@ -141,6 +142,7 @@
 import com.android.internal.telephony.SmsApplication.SmsApplicationData;
 import com.android.internal.telephony.SubscriptionController;
 import com.android.internal.telephony.TelephonyPermissions;
+import com.android.internal.telephony.dataconnection.ApnSettingUtils;
 import com.android.internal.telephony.emergency.EmergencyNumberTracker;
 import com.android.internal.telephony.euicc.EuiccConnector;
 import com.android.internal.telephony.ims.ImsResolver;
@@ -6954,4 +6956,31 @@
         if (hv.equals(HalVersion.UNKNOWN)) return -1;
         return hv.major * 100 + hv.minor;
     }
+
+    /**
+     *  Mms is allowed if
+     *  1) user data is turned on, or
+     *  2) Mms is un-metered, or
+     *  3) alwaysAllowMms setting is turned on.
+     */
+    @Override
+    public boolean isMmsDataEnabled(int subId, String callingPackage) {
+        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
+                mApp, subId, callingPackage, "isMmsDataEnabled")) {
+            throw new SecurityException("Needs READ_PHONE_STATE for isMmsDataEnabled");
+        }
+
+        // Now that all security checks passes, perform the operation as ourselves.
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Phone phone = getPhone(subId);
+            if (phone == null) return false;
+
+            boolean isMetered = ApnSettingUtils.isMeteredApnType(ApnSetting.getApnTypeString(
+                    TYPE_MMS), phone);
+            return !isMetered || phone.getDataEnabledSettings().isDataEnabled(TYPE_MMS);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
 }

src/com/android/services/telephony/ImsConference.java

diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index cada504..1f157e3 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -209,6 +209,11 @@
             Log.v(this, "onExtrasRemoved: c=" + c + " key=" + keys);
             removeExtras(keys);
         }
+
+        @Override
+        public void onConnectionEvent(Connection c, String event, Bundle extras) {
+            sendConnectionEvent(event, extras);
+        }
     };
 
     /**