summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Taylor <tomtaylor@google.com>2020-01-21 18:19:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-01-21 18:19:45 +0000
commit6dc562c6fa76a67981e8f7fb5c66a3c1ec547855 (patch)
tree7a0be7c4b25d62647e129edd9febb6c53532f336
parent4361177f75de94167524e9ed930a07c0621549a9 (diff)
parent235a3d65b77adcf4ce25a576deb0e804b3d88fd0 (diff)
downloadMms-6dc562c6fa76a67981e8f7fb5c66a3c1ec547855.tar.gz
Merge "Add security policy to MmsService"
-rw-r--r--src/com/android/mms/service/MmsService.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/mms/service/MmsService.java b/src/com/android/mms/service/MmsService.java
index 858cb4a..f94ae8a 100644
--- a/src/com/android/mms/service/MmsService.java
+++ b/src/com/android/mms/service/MmsService.java
@@ -39,6 +39,7 @@ import android.os.RemoteException;
import android.os.UserHandle;
import android.provider.Settings;
import android.provider.Telephony;
+import android.security.NetworkSecurityPolicy;
import android.service.carrier.CarrierMessagingService;
import android.telephony.SmsManager;
import android.telephony.SubscriptionManager;
@@ -546,6 +547,9 @@ public class MmsService extends Service implements MmsRequest.RequestManager {
LogUtil.d("onCreate");
// Load mms_config
MmsConfigManager.getInstance().init(this);
+
+ NetworkSecurityPolicy.getInstance().setCleartextTrafficPermitted(true);
+
// Initialize running request state
for (int i = 0; i < mRunningRequestExecutors.length; i++) {
mRunningRequestExecutors[i] = Executors.newFixedThreadPool(THREAD_POOL_SIZE);