diff options
author | Artur Satayev <satayev@google.com> | 2019-12-11 11:50:17 +0000 |
---|---|---|
committer | satayev <satayev@google.com> | 2019-12-11 19:34:44 +0000 |
commit | 552da5ad90911caa472a68f0bfd01848563ef2f9 (patch) | |
tree | a22fd2197484668f7c6924a878bbfe7c69c93a56 /libart | |
parent | 86b889742c3491c1d5379e146b175f9325e7c377 (diff) |
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
Diffstat (limited to 'libart')
-rw-r--r-- | libart/src/main/java/dalvik/system/VMRuntime.java | 8 | ||||
-rw-r--r-- | libart/src/main/java/dalvik/system/VMStack.java | 3 | ||||
-rw-r--r-- | libart/src/main/java/java/lang/Daemons.java | 9 | ||||
-rw-r--r-- | libart/src/main/java/java/lang/DexCache.java | 2 |
4 files changed, 13 insertions, 9 deletions
diff --git a/libart/src/main/java/dalvik/system/VMRuntime.java b/libart/src/main/java/dalvik/system/VMRuntime.java index 2b3665290d..99bc678dc8 100644 --- a/libart/src/main/java/dalvik/system/VMRuntime.java +++ b/libart/src/main/java/dalvik/system/VMRuntime.java @@ -16,14 +16,16 @@ package dalvik.system; -import dalvik.annotation.compat.UnsupportedAppUsage; -import dalvik.annotation.optimization.FastNative; +import android.compat.annotation.UnsupportedAppUsage; + import java.lang.ref.FinalizerReference; -import java.util.concurrent.atomic.AtomicInteger; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; +import dalvik.annotation.optimization.FastNative; + /** * Provides an interface to VM-global, Dalvik-specific features. * An application cannot create its own Runtime instance, and must obtain diff --git a/libart/src/main/java/dalvik/system/VMStack.java b/libart/src/main/java/dalvik/system/VMStack.java index d84fef677f..89ce215ad9 100644 --- a/libart/src/main/java/dalvik/system/VMStack.java +++ b/libart/src/main/java/dalvik/system/VMStack.java @@ -16,7 +16,8 @@ package dalvik.system; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; + import dalvik.annotation.optimization.FastNative; /** diff --git a/libart/src/main/java/java/lang/Daemons.java b/libart/src/main/java/java/lang/Daemons.java index 7d0eca2f08..183a588262 100644 --- a/libart/src/main/java/java/lang/Daemons.java +++ b/libart/src/main/java/java/lang/Daemons.java @@ -16,19 +16,20 @@ package java.lang; +import android.compat.annotation.UnsupportedAppUsage; import android.system.Os; import android.system.OsConstants; -import dalvik.annotation.compat.UnsupportedAppUsage; -import dalvik.system.VMRuntime; + import java.lang.ref.FinalizerReference; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicInteger; import libcore.util.EmptyArray; +import dalvik.system.VMRuntime; + /** * Calls Object.finalize() on objects in the finalizer reference queue. The VM * will abort if any finalize() call takes more than the maximum finalize time diff --git a/libart/src/main/java/java/lang/DexCache.java b/libart/src/main/java/java/lang/DexCache.java index 7c4a6edb71..f9e3ea3cf3 100644 --- a/libart/src/main/java/java/lang/DexCache.java +++ b/libart/src/main/java/java/lang/DexCache.java @@ -32,7 +32,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.optimization.FastNative; /** |