diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-27 19:53:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-27 19:53:55 +0000 |
| commit | 1b4ec7b954ba2d8efae2f383697babe54b795f67 (patch) | |
| tree | 4c051c4a8702f4256f83f0e55182e27b2ed5b840 /java/com/android/dialer/assisteddialing/Constraints.java | |
| parent | cae28c6d5c04a79fb058043ce0c3e043e610309a (diff) | |
| parent | d637af51091dc86a197da6520484e10a356a421b (diff) | |
Merge changes I0f1ed20a,Ia68d3b13,I72047d59,Ieff3c7fb,I53c3896a, ...
* changes:
Added method to set Save and Redo buttons enabled/disabled Added logic to setState() method to change state of buttons
Update emergency call map and device number UI.
Fix SpeedDialUiItem.getDefaultVoiceChannel
Fix an AOSP build error caused by version codes
Update connection label.
Remove redundant version checks and annotations in the assisted dialing package.
Diffstat (limited to 'java/com/android/dialer/assisteddialing/Constraints.java')
| -rw-r--r-- | java/com/android/dialer/assisteddialing/Constraints.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/java/com/android/dialer/assisteddialing/Constraints.java b/java/com/android/dialer/assisteddialing/Constraints.java index cae3734be..41a3e92b2 100644 --- a/java/com/android/dialer/assisteddialing/Constraints.java +++ b/java/com/android/dialer/assisteddialing/Constraints.java @@ -16,9 +16,7 @@ package com.android.dialer.assisteddialing; -import android.annotation.TargetApi; import android.content.Context; -import android.os.Build.VERSION_CODES; import android.support.annotation.NonNull; import android.telephony.PhoneNumberUtils; import android.text.TextUtils; @@ -35,8 +33,6 @@ import java.util.Locale; import java.util.Optional; /** Ensures that a number is eligible for Assisted Dialing */ -@TargetApi(VERSION_CODES.N) -@SuppressWarnings("AndroidApiChecker") // Use of optional final class Constraints { private final PhoneNumberUtil phoneNumberUtil; private final Context context; @@ -46,7 +42,7 @@ final class Constraints { * Create a new instance of Constraints. * * @param context The context used to determine whether or not a number is an emergency number. - * @param configProviderCountryCodes A csv of supported country codes, e.g. "US,CA" + * @param countryCodeProvider A csv of supported country codes, e.g. "US,CA" */ public Constraints(@NonNull Context context, @NonNull CountryCodeProvider countryCodeProvider) { if (context == null) { @@ -73,7 +69,7 @@ final class Constraints { * @return A boolean indicating whether or not the provided values are eligible for assisted * dialing. */ - public boolean meetsPreconditions( + boolean meetsPreconditions( @NonNull String numberToCheck, @NonNull String userHomeCountryCode, @NonNull String userRoamingCountryCode) { |