diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-18 16:31:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-18 16:31:41 +0000 |
| commit | 277353090cbb27a55f4050bf16bc800b0d6f825e (patch) | |
| tree | 58f0ad9b92d77a7784a409870185e44d0f4e5fe7 /telecomm/java/android/telecom/CallerInfo.java | |
| parent | edd82314a962fccd96981d556994c6e6509afd30 (diff) | |
| parent | c7f44bacbe788923177355bd4f82b65414472e45 (diff) | |
Merge "Use new UnsupportedAppUsage annotation." am: 1385dca8f6 am: 068a9faf3d am: c7f44bacbe
Change-Id: I30839db2fe99ba4670ec1b39d5e64540fdd15f69
Diffstat (limited to 'telecomm/java/android/telecom/CallerInfo.java')
| -rw-r--r-- | telecomm/java/android/telecom/CallerInfo.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/CallerInfo.java b/telecomm/java/android/telecom/CallerInfo.java index a5d25e2ce4bb..fb6f99405759 100644 --- a/telecomm/java/android/telecom/CallerInfo.java +++ b/telecomm/java/android/telecom/CallerInfo.java @@ -17,7 +17,7 @@ package android.telecom; import android.annotation.Nullable; -import android.annotation.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; @@ -41,8 +41,8 @@ import com.android.i18n.phonenumbers.NumberParseException; import com.android.i18n.phonenumbers.PhoneNumberUtil; import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber; import com.android.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder; - import com.android.internal.annotations.VisibleForTesting; + import java.util.Locale; |