diff options
| author | Aaron Huang <huangaaron@google.com> | 2021-04-09 04:30:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-09 04:30:18 +0000 |
| commit | 12e57a95530067fef86ba5605b8a832e78c7eb75 (patch) | |
| tree | a8c8b1d54c196bb78ef186b633f19b66eeba7384 | |
| parent | 21aa1feb4930caa4a11917ee41e7e27b8860cbeb (diff) | |
| parent | edbdf4a3376fc24de357798570a26622bc2333d9 (diff) | |
| download | Mms-12e57a95530067fef86ba5605b8a832e78c7eb75.tar.gz | |
Replace NetworkUtils.trimV4AddrZeros with alternative am: c78e62833c am: edbdf4a337temp_ab_7272582
Original change: https://android-review.googlesource.com/c/platform/packages/services/Mms/+/1666542
Change-Id: Ic8438ca1cecd8917d1e4f6885ebecda140283520
| -rw-r--r-- | src/com/android/mms/service/ApnSettings.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/mms/service/ApnSettings.java b/src/com/android/mms/service/ApnSettings.java index 65d38b7..42d6427 100644 --- a/src/com/android/mms/service/ApnSettings.java +++ b/src/com/android/mms/service/ApnSettings.java @@ -18,13 +18,13 @@ package com.android.mms.service; import android.content.Context; import android.database.Cursor; -import android.net.NetworkUtils; import android.net.Uri; import android.provider.Telephony; import android.telephony.data.ApnSetting; import android.text.TextUtils; import com.android.mms.service.exception.ApnException; +import com.android.net.module.util.Inet4AddressUtils; import java.net.URI; import java.net.URISyntaxException; @@ -132,7 +132,7 @@ public class ApnSettings { if (TextUtils.isEmpty(mmscUrl)) { continue; } - mmscUrl = NetworkUtils.trimV4AddrZeros(mmscUrl); + mmscUrl = Inet4AddressUtils.trimAddressZeros(mmscUrl); try { new URI(mmscUrl); } catch (URISyntaxException e) { @@ -140,7 +140,7 @@ public class ApnSettings { } String proxyAddress = trimWithNullCheck(cursor.getString(COLUMN_MMSPROXY)); if (!TextUtils.isEmpty(proxyAddress)) { - proxyAddress = NetworkUtils.trimV4AddrZeros(proxyAddress); + proxyAddress = Inet4AddressUtils.trimAddressZeros(proxyAddress); final String portString = trimWithNullCheck(cursor.getString(COLUMN_MMSPORT)); if (!TextUtils.isEmpty(portString)) { |