From 552da5ad90911caa472a68f0bfd01848563ef2f9 Mon Sep 17 00:00:00 2001 From: Artur Satayev Date: Wed, 11 Dec 2019 11:50:17 +0000 Subject: Use new UnsupportedAppUsage annotation. New annotation is tools/platform-compat/annotation/src/java/android/compat/annotation/UnsupportedAppUsage.java. Existing annotations in libcore/ and frameworks/ will be deleted after the migration: - libcore/dalvik/src/main/java/dalvik/annotation/compat/UnsupportedAppUsage.java - frameworks/base/core/java/android/annotation/UnsupportedAppUsage.java This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library. Bug: 145132366 Test: m && diff unsupportedappusage_index.csv Exempt-From-Owner-Approval: +2 by owner, by vote lost on latest patch. Change-Id: Ib5b7baa399cdc38da1d3ca622ba0ba26936b1b2d --- ojluni/annotations/hiddenapi/java/io/ObjectInputStream.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ojluni/annotations/hiddenapi/java/io/ObjectInputStream.java') diff --git a/ojluni/annotations/hiddenapi/java/io/ObjectInputStream.java b/ojluni/annotations/hiddenapi/java/io/ObjectInputStream.java index 90dcfea0cb..562d846f23 100644 --- a/ojluni/annotations/hiddenapi/java/io/ObjectInputStream.java +++ b/ojluni/annotations/hiddenapi/java/io/ObjectInputStream.java @@ -26,7 +26,7 @@ package java.io; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ObjectInputStream extends java.io.InputStream -- cgit v1.2.3