commit a63a2c0130f6adfa6c0bf112021bc61f569d8105
author Austin Wang <wangaustin@google.com> Thu Dec 19 06:38:19 2019 +0000
committer Austin Wang <wangaustin@google.com> Thu Dec 19 06:38:19 2019 +0000
tree e3c9d96127eb12f39eb8845b1e7d0675fa565d45
parent a5264903e22bc741add895133474ea13a370de4c

Revert "Use new UnsupportedAppUsage annotation."

This reverts commit a5264903e22bc741add895133474ea13a370de4c.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=sdk_phone_armv7-sdk&lkgb=6083299&lkbb=6085371&fkbb=6083313, bug b/146533269

Change-Id: Ie5b031d7b277cf0e09b0a9776b26bf74f5f69e70

telecomm/java/android/telecom/CallerInfo.java

diff --git a/telecomm/java/android/telecom/CallerInfo.java b/telecomm/java/android/telecom/CallerInfo.java
index fb6f994..a5d25e2 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.compat.annotation.UnsupportedAppUsage;
+import android.annotation.UnsupportedAppUsage;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -41,8 +41,8 @@
 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 com.android.internal.annotations.VisibleForTesting;
 import java.util.Locale;