summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/assisteddialing/NumberTransformer.java
diff options
context:
space:
mode:
authorlinyuh <linyuh@google.com>2018-06-26 10:33:34 -0700
committerCopybara-Service <copybara-piper@google.com>2018-06-27 11:05:43 -0700
commitde53e545276c7854de0d2886a6cb8c849b3b1e62 (patch)
tree72e4b2eea356e41ac0b87f20e119d020ad6aa435 /java/com/android/dialer/assisteddialing/NumberTransformer.java
parentcae28c6d5c04a79fb058043ce0c3e043e610309a (diff)
Remove redundant version checks and annotations in the assisted dialing package.
Test: Existing tests PiperOrigin-RevId: 202151952 Change-Id: I0c1ad7b35ec1a57ae9f5d51ba935bfcd9f529379
Diffstat (limited to 'java/com/android/dialer/assisteddialing/NumberTransformer.java')
-rw-r--r--java/com/android/dialer/assisteddialing/NumberTransformer.java23
1 files changed, 3 insertions, 20 deletions
diff --git a/java/com/android/dialer/assisteddialing/NumberTransformer.java b/java/com/android/dialer/assisteddialing/NumberTransformer.java
index 8bbad329d..eabf8564e 100644
--- a/java/com/android/dialer/assisteddialing/NumberTransformer.java
+++ b/java/com/android/dialer/assisteddialing/NumberTransformer.java
@@ -16,9 +16,6 @@
package com.android.dialer.assisteddialing;
-import android.annotation.TargetApi;
-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;
@@ -33,21 +30,9 @@ final class NumberTransformer {
private final PhoneNumberUtil phoneNumberUtil;
private final Constraints constraints;
- public NumberTransformer(Constraints constraints) {
+ NumberTransformer(Constraints constraints) {
this.constraints = constraints;
- this.phoneNumberUtil = StrictModeUtils.bypass(() -> PhoneNumberUtil.getInstance());
- }
-
- /**
- * Returns a boolean for callers to quickly determine whether or not the AssistedDialingMediator
- * thinks an attempt at assisted dialing is likely to succeed.
- */
- public boolean canDoAssistedDialingTransformation(
- @NonNull String numberToCheck,
- @NonNull String userHomeCountryCode,
- @NonNull String userRoamingCountryCode) {
- return constraints.meetsPreconditions(
- numberToCheck, userHomeCountryCode, userRoamingCountryCode);
+ this.phoneNumberUtil = StrictModeUtils.bypass(PhoneNumberUtil::getInstance);
}
/**
@@ -57,9 +42,7 @@ final class NumberTransformer {
* transformation fails, we return an empty optional. The operation can be considered a success
* when the Optional we return has a value set.
*/
- @SuppressWarnings("AndroidApiChecker") // Use of optional
- @TargetApi(VERSION_CODES.N)
- public Optional<TransformationInfo> doAssistedDialingTransformation(
+ Optional<TransformationInfo> doAssistedDialingTransformation(
String numbertoTransform, String userHomeCountryCode, String userRoamingCountryCode) {
if (!constraints.meetsPreconditions(