diff options
author | linyuh <linyuh@google.com> | 2018-06-26 10:33:34 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-27 11:05:43 -0700 |
commit | de53e545276c7854de0d2886a6cb8c849b3b1e62 (patch) | |
tree | 72e4b2eea356e41ac0b87f20e119d020ad6aa435 /java/com/android/dialer/assisteddialing/LocationDetector.java | |
parent | cae28c6d5c04a79fb058043ce0c3e043e610309a (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/LocationDetector.java')
-rw-r--r-- | java/com/android/dialer/assisteddialing/LocationDetector.java | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/java/com/android/dialer/assisteddialing/LocationDetector.java b/java/com/android/dialer/assisteddialing/LocationDetector.java index 8e7535c1b..9fa944125 100644 --- a/java/com/android/dialer/assisteddialing/LocationDetector.java +++ b/java/com/android/dialer/assisteddialing/LocationDetector.java @@ -16,8 +16,6 @@ package com.android.dialer.assisteddialing; -import android.annotation.TargetApi; -import android.os.Build.VERSION_CODES; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.telephony.TelephonyManager; @@ -36,7 +34,7 @@ final class LocationDetector { private final TelephonyManager telephonyManager; private final String userProvidedHomeCountry; - public LocationDetector( + LocationDetector( @NonNull TelephonyManager telephonyManager, @Nullable String userProvidedHomeCountry) { if (telephonyManager == null) { throw new NullPointerException("Provided TelephonyManager was null"); @@ -53,9 +51,7 @@ final class LocationDetector { * Returns what we believe to be the User's home country. This should resolve to * PROPERTY_ICC_OPERATOR_ISO_COUNTRY */ - @SuppressWarnings("AndroidApiChecker") // Use of optional - @TargetApi(VERSION_CODES.N) - public Optional<String> getUpperCaseUserHomeCountry() { + Optional<String> getUpperCaseUserHomeCountry() { if (!TextUtils.isEmpty(userProvidedHomeCountry)) { LogUtil.i( @@ -73,9 +69,7 @@ final class LocationDetector { } /** Returns what we believe to be the User's current (roaming) country */ - @SuppressWarnings("AndroidApiChecker") // Use of optional - @TargetApi(VERSION_CODES.N) - public Optional<String> getUpperCaseUserRoamingCountry() { + Optional<String> getUpperCaseUserRoamingCountry() { // TODO Increase coverage of location resolution?? String networkCountryIso = telephonyManager.getNetworkCountryIso(); if (networkCountryIso != null) { |