summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/assisteddialing/NumberTransformer.java
diff options
context:
space:
mode:
authorerfanian <erfanian@google.com>2018-01-25 14:31:06 -0800
committerCopybara-Service <copybara-piper@google.com>2018-01-25 15:56:25 -0800
commit334c0e1b40e4967e254d9e6ccd0bef447767867a (patch)
tree22437ddadb9b8016f14c74333364f96f5cea6998 /java/com/android/dialer/assisteddialing/NumberTransformer.java
parent02dd493e62f22a488c4bc8438471e30d9b84b936 (diff)
Explicitly disable strict mode during the assisted dialing action.
Dialing is a critical path and there is no opportunity to perform this action asynchronously. Starting in P we could leverage the libphonenumber instance that would live in PhoneGlobals and share that to warm up the disk reads. Bug: 70860471 Test: none. Unit tests do not trigger strict mode violations. PiperOrigin-RevId: 183292426 Change-Id: I607c6af4d725272152f31e619367fdde5ed07302
Diffstat (limited to 'java/com/android/dialer/assisteddialing/NumberTransformer.java')
-rw-r--r--java/com/android/dialer/assisteddialing/NumberTransformer.java27
1 files changed, 20 insertions, 7 deletions
diff --git a/java/com/android/dialer/assisteddialing/NumberTransformer.java b/java/com/android/dialer/assisteddialing/NumberTransformer.java
index 0156f2ec2..8bbad329d 100644
--- a/java/com/android/dialer/assisteddialing/NumberTransformer.java
+++ b/java/com/android/dialer/assisteddialing/NumberTransformer.java
@@ -21,6 +21,7 @@ import android.os.Build.VERSION_CODES;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import com.android.dialer.common.LogUtil;
+import com.android.dialer.strictmode.StrictModeUtils;
import com.google.i18n.phonenumbers.NumberParseException;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
@@ -29,11 +30,12 @@ import java.util.Optional;
/** Responsible for transforming numbers to make them dialable and valid when roaming. */
final class NumberTransformer {
- private final PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance();
+ private final PhoneNumberUtil phoneNumberUtil;
private final Constraints constraints;
public NumberTransformer(Constraints constraints) {
this.constraints = constraints;
+ this.phoneNumberUtil = StrictModeUtils.bypass(() -> PhoneNumberUtil.getInstance());
}
/**
@@ -68,16 +70,27 @@ final class NumberTransformer {
return Optional.empty();
}
- PhoneNumber phoneNumber;
- try {
- phoneNumber = phoneNumberUtil.parse(numbertoTransform, userHomeCountryCode);
- } catch (NumberParseException e) {
- LogUtil.i("NumberTransformer.doAssistedDialingTransformation", "number failed to parse");
+ PhoneNumber phoneNumber =
+ StrictModeUtils.bypass(
+ () -> {
+ try {
+ return phoneNumberUtil.parse(numbertoTransform, userHomeCountryCode);
+ } catch (NumberParseException e) {
+ LogUtil.i(
+ "NumberTransformer.doAssistedDialingTransformation", "number failed to parse");
+ return null;
+ }
+ });
+
+ if (phoneNumber == null) {
return Optional.empty();
}
String transformedNumber =
- phoneNumberUtil.formatNumberForMobileDialing(phoneNumber, userRoamingCountryCode, true);
+ StrictModeUtils.bypass(
+ () ->
+ phoneNumberUtil.formatNumberForMobileDialing(
+ phoneNumber, userRoamingCountryCode, true));
// formatNumberForMobileDialing may return an empty String.
if (TextUtils.isEmpty(transformedNumber)) {