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/CountryCodeProvider.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/CountryCodeProvider.java')
| -rw-r--r-- | java/com/android/dialer/assisteddialing/CountryCodeProvider.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/java/com/android/dialer/assisteddialing/CountryCodeProvider.java b/java/com/android/dialer/assisteddialing/CountryCodeProvider.java index 118696e9b..04b229150 100644 --- a/java/com/android/dialer/assisteddialing/CountryCodeProvider.java +++ b/java/com/android/dialer/assisteddialing/CountryCodeProvider.java @@ -16,8 +16,6 @@ package com.android.dialer.assisteddialing; -import android.annotation.TargetApi; -import android.os.Build.VERSION_CODES; import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.ArraySet; @@ -32,8 +30,6 @@ import java.util.StringTokenizer; import java.util.stream.Collectors; /** A class to provide the appropriate country codes related to assisted dialing. */ -@TargetApi(VERSION_CODES.N) -@SuppressWarnings("AndroidApiChecker") // Java 8 APIs public final class CountryCodeProvider { // TODO(erfanian): Ensure the below standard is consistent between libphonenumber and the |