diff options
| author | Artur Satayev <satayev@google.com> | 2020-01-09 08:03:32 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2020-01-09 08:03:32 -0800 |
| commit | fe3063fb7176f0734edd610ed76aa5b1921ac3a9 (patch) | |
| tree | bbda0e685fb4b377ae64392ac1cef2b5ccb0fa20 /core/java/android/app/ActivityThread.java | |
| parent | 80cf87254e69a8f8681e434b710ff6e8e605681d (diff) | |
| parent | 70129fc86302eac1aca411cf80bcfedd86532d19 (diff) | |
Merge "Use new UnsupportedAppUsage annotation."
am: 70129fc863
Change-Id: I86ab79e8649c86f69e7435a619c7dce08d432d98
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 4e8bee24052e..c4281f0b8d28 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -32,7 +32,6 @@ import static com.android.internal.annotations.VisibleForTesting.Visibility.PACK import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.UnsupportedAppUsage; import android.app.assist.AssistContent; import android.app.assist.AssistStructure; import android.app.backup.BackupAgent; @@ -46,6 +45,7 @@ import android.app.servertransaction.PendingTransactionActions; import android.app.servertransaction.PendingTransactionActions.StopInfo; import android.app.servertransaction.TransactionExecutor; import android.app.servertransaction.TransactionExecutorHelper; +import android.compat.annotation.UnsupportedAppUsage; import android.content.AutofillOptions; import android.content.BroadcastReceiver; import android.content.ComponentCallbacks2; |