diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-28 20:59:07 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-28 20:59:07 +0000 |
commit | ea2f430dd5f5f5f08bb5c9438696112f44423abe (patch) | |
tree | eb2b91eaa8fafe6041c27dae82a68888ba771a93 /java/com/android/dialer/assisteddialing/LocationDetector.java | |
parent | 126469d1020dbcb88146d595414faf9a0c4a1a28 (diff) | |
parent | 96aea2a8f42bfc55dd2b08c51698efb0d0559109 (diff) |
Merge changes I0ff396b5,I3b668c3a,Iab630f19,I6ef204ac
* changes:
Use goAsync() and dialer executor to insert post call notifications
Add the assisted dialing logic module.
Refactor DialerStrictMode into an interface.
Adding logging for transcription polling requests
Diffstat (limited to 'java/com/android/dialer/assisteddialing/LocationDetector.java')
-rw-r--r-- | java/com/android/dialer/assisteddialing/LocationDetector.java | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/java/com/android/dialer/assisteddialing/LocationDetector.java b/java/com/android/dialer/assisteddialing/LocationDetector.java new file mode 100644 index 000000000..684068912 --- /dev/null +++ b/java/com/android/dialer/assisteddialing/LocationDetector.java @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.dialer.assisteddialing; + +import android.annotation.TargetApi; +import android.os.Build.VERSION_CODES; +import android.support.annotation.NonNull; +import android.telephony.TelephonyManager; +import com.android.dialer.common.LogUtil; +import java.util.Locale; +import java.util.Optional; + +// TODO(erfanian): Improve definition of roaming and home country in finalized API. +/** + * LocationDetector is responsible for determining the Roaming location of the User, in addition to + * User's home country. + */ +final class LocationDetector { + + private final TelephonyManager telephonyManager; + + public LocationDetector(@NonNull TelephonyManager telephonyManager) { + if (telephonyManager == null) { + throw new NullPointerException("Provided TelephonyManager was null"); + } + this.telephonyManager = telephonyManager; + } + + // TODO(erfanian): confirm this is based on ISO 3166-1 alpha-2. libphonenumber expects Unicode's + // CLDR + // TODO(erfanian): confirm these are still valid in a multi-sim environment. + /** + * 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() { + String simCountryIso = telephonyManager.getSimCountryIso(); + if (simCountryIso != null) { + return Optional.of(telephonyManager.getSimCountryIso().toUpperCase(Locale.US)); + } + LogUtil.i("LocationDetector.getUpperCaseUserHomeCountry", "user home country was null"); + return Optional.empty(); + } + + /** 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() { + // TODO Increase coverage of location resolution?? + String networkCountryIso = telephonyManager.getNetworkCountryIso(); + if (networkCountryIso != null) { + return Optional.of(telephonyManager.getNetworkCountryIso().toUpperCase(Locale.US)); + } + LogUtil.i("LocationDetector.getUpperCaseUserRoamingCountry", "user roaming country was null"); + return Optional.empty(); + } +} |