diff options
303 files changed, 805 insertions, 798 deletions
diff --git a/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java b/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java index 1c129e2852..1993fd5730 100644 --- a/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java +++ b/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java @@ -16,7 +16,7 @@ package dalvik.system; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.io.File; import java.io.IOException; import java.net.URL; diff --git a/dalvik/src/main/java/dalvik/system/BlockGuard.java b/dalvik/src/main/java/dalvik/system/BlockGuard.java index c608407dd5..192e450b67 100644 --- a/dalvik/src/main/java/dalvik/system/BlockGuard.java +++ b/dalvik/src/main/java/dalvik/system/BlockGuard.java @@ -16,10 +16,10 @@ package dalvik.system; -import libcore.util.NonNull; +import android.compat.annotation.UnsupportedAppUsage; -import dalvik.annotation.compat.UnsupportedAppUsage; import java.util.Objects; +import libcore.util.NonNull; /** * Interface that enables {@code StrictMode} to install callbacks to implement diff --git a/dalvik/src/main/java/dalvik/system/CloseGuard.java b/dalvik/src/main/java/dalvik/system/CloseGuard.java index 818f2894a1..4607f2d8aa 100644 --- a/dalvik/src/main/java/dalvik/system/CloseGuard.java +++ b/dalvik/src/main/java/dalvik/system/CloseGuard.java @@ -16,7 +16,7 @@ package dalvik.system; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; /** * CloseGuard is a mechanism for flagging implicit finalizer cleanup of diff --git a/dalvik/src/main/java/dalvik/system/DexFile.java b/dalvik/src/main/java/dalvik/system/DexFile.java index 486ee90830..176fde4610 100644 --- a/dalvik/src/main/java/dalvik/system/DexFile.java +++ b/dalvik/src/main/java/dalvik/system/DexFile.java @@ -16,9 +16,9 @@ package dalvik.system; +import android.compat.annotation.UnsupportedAppUsage; import android.system.ErrnoException; -import dalvik.annotation.compat.UnsupportedAppUsage; -import dalvik.annotation.optimization.ReachabilitySensitive; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -28,6 +28,8 @@ import java.util.Enumeration; import java.util.List; import libcore.io.Libcore; +import dalvik.annotation.optimization.ReachabilitySensitive; + /** * Loads DEX files. This class is meant for internal use and should not be used * by applications. diff --git a/dalvik/src/main/java/dalvik/system/DexPathList.java b/dalvik/src/main/java/dalvik/system/DexPathList.java index c63bb13477..888eea9237 100644 --- a/dalvik/src/main/java/dalvik/system/DexPathList.java +++ b/dalvik/src/main/java/dalvik/system/DexPathList.java @@ -16,9 +16,10 @@ package dalvik.system; +import android.compat.annotation.UnsupportedAppUsage; import android.system.ErrnoException; import android.system.StructStat; -import dalvik.annotation.compat.UnsupportedAppUsage; + import java.io.File; import java.io.IOException; import java.net.MalformedURLException; diff --git a/dalvik/src/main/java/dalvik/system/SocketTagger.java b/dalvik/src/main/java/dalvik/system/SocketTagger.java index 54ede15253..0493daa90a 100644 --- a/dalvik/src/main/java/dalvik/system/SocketTagger.java +++ b/dalvik/src/main/java/dalvik/system/SocketTagger.java @@ -16,7 +16,7 @@ package dalvik.system; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.io.FileDescriptor; import java.net.DatagramSocket; import java.net.Socket; diff --git a/dalvik/src/main/java/dalvik/system/VMDebug.java b/dalvik/src/main/java/dalvik/system/VMDebug.java index 2a0e4ef586..4436e3f723 100644 --- a/dalvik/src/main/java/dalvik/system/VMDebug.java +++ b/dalvik/src/main/java/dalvik/system/VMDebug.java @@ -16,13 +16,15 @@ package dalvik.system; -import dalvik.annotation.compat.UnsupportedAppUsage; -import dalvik.annotation.optimization.FastNative; +import android.compat.annotation.UnsupportedAppUsage; + import java.io.FileDescriptor; import java.io.IOException; import java.util.HashMap; import java.util.Map; +import dalvik.annotation.optimization.FastNative; + /** * Provides access to some VM-specific debug features. Though this class and * many of its members are public, this class is meant to be wrapped in a more diff --git a/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/Chunk.java b/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/Chunk.java index 373364bf42..292e967959 100644 --- a/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/Chunk.java +++ b/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/Chunk.java @@ -16,7 +16,7 @@ package org.apache.harmony.dalvik.ddmc; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.nio.ByteBuffer; /** diff --git a/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/ChunkHandler.java b/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/ChunkHandler.java index d7f370d0e8..0fb74f8e5a 100644 --- a/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/ChunkHandler.java +++ b/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/ChunkHandler.java @@ -16,7 +16,7 @@ package org.apache.harmony.dalvik.ddmc; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmServer.java b/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmServer.java index e961d56e46..f1f58b6d53 100644 --- a/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmServer.java +++ b/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmServer.java @@ -16,12 +16,14 @@ package org.apache.harmony.dalvik.ddmc; -import dalvik.annotation.compat.UnsupportedAppUsage; -import dalvik.annotation.optimization.FastNative; +import android.compat.annotation.UnsupportedAppUsage; + import java.util.Collection; import java.util.HashMap; import java.util.Iterator; +import dalvik.annotation.optimization.FastNative; + /** * This represents our connection to the DDM Server. diff --git a/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmVmInternal.java b/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmVmInternal.java index ac994bb22b..2c961da811 100644 --- a/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmVmInternal.java +++ b/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmVmInternal.java @@ -16,7 +16,7 @@ package org.apache.harmony.dalvik.ddmc; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.optimization.FastNative; /** diff --git a/json/src/main/java/org/json/JSONArray.java b/json/src/main/java/org/json/JSONArray.java index 5e758d73bd..df0b2437cd 100644 --- a/json/src/main/java/org/json/JSONArray.java +++ b/json/src/main/java/org/json/JSONArray.java @@ -16,7 +16,7 @@ package org.json; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Collection; diff --git a/json/src/main/java/org/json/JSONObject.java b/json/src/main/java/org/json/JSONObject.java index 0565b25c12..40d15bbc31 100644 --- a/json/src/main/java/org/json/JSONObject.java +++ b/json/src/main/java/org/json/JSONObject.java @@ -16,7 +16,8 @@ package org.json; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; + import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; diff --git a/json/src/main/java/org/json/JSONStringer.java b/json/src/main/java/org/json/JSONStringer.java index 3d1738ce60..ef1b47c2fe 100644 --- a/json/src/main/java/org/json/JSONStringer.java +++ b/json/src/main/java/org/json/JSONStringer.java @@ -16,7 +16,7 @@ package org.json; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/json/src/main/java/org/json/JSONTokener.java b/json/src/main/java/org/json/JSONTokener.java index 55667b0ae6..6266860a3c 100644 --- a/json/src/main/java/org/json/JSONTokener.java +++ b/json/src/main/java/org/json/JSONTokener.java @@ -16,7 +16,7 @@ package org.json; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; // Note: this class was written without inspecting the non-free org.json sourcecode. 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; /** diff --git a/luni/src/main/java/android/system/Int32Ref.java b/luni/src/main/java/android/system/Int32Ref.java index 8ffcfc5f25..c43c796229 100644 --- a/luni/src/main/java/android/system/Int32Ref.java +++ b/luni/src/main/java/android/system/Int32Ref.java @@ -18,7 +18,7 @@ package android.system; import libcore.util.Objects; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; /** * @hide diff --git a/luni/src/main/java/android/system/NetlinkSocketAddress.java b/luni/src/main/java/android/system/NetlinkSocketAddress.java index 64b0eabe7d..b4f6e74754 100644 --- a/luni/src/main/java/android/system/NetlinkSocketAddress.java +++ b/luni/src/main/java/android/system/NetlinkSocketAddress.java @@ -16,9 +16,10 @@ package android.system; -import dalvik.annotation.compat.UnsupportedAppUsage; -import libcore.util.Objects; +import android.compat.annotation.UnsupportedAppUsage; + import java.net.SocketAddress; +import libcore.util.Objects; /** * Netlink socket address. diff --git a/luni/src/main/java/android/system/Os.java b/luni/src/main/java/android/system/Os.java index 4c258c69e2..e2b191eee7 100644 --- a/luni/src/main/java/android/system/Os.java +++ b/luni/src/main/java/android/system/Os.java @@ -16,11 +16,7 @@ package android.system; -import dalvik.annotation.compat.UnsupportedAppUsage; - -import libcore.io.Libcore; -import libcore.util.NonNull; -import libcore.util.Nullable; +import android.compat.annotation.UnsupportedAppUsage; import java.io.FileDescriptor; import java.io.InterruptedIOException; @@ -29,6 +25,9 @@ import java.net.InetSocketAddress; import java.net.SocketAddress; import java.net.SocketException; import java.nio.ByteBuffer; +import libcore.io.Libcore; +import libcore.util.NonNull; +import libcore.util.Nullable; /** * Access to low-level system functionality. Most of these are system calls. Most users will want diff --git a/luni/src/main/java/android/system/OsConstants.java b/luni/src/main/java/android/system/OsConstants.java index d8745511c2..1b0dc16d85 100644 --- a/luni/src/main/java/android/system/OsConstants.java +++ b/luni/src/main/java/android/system/OsConstants.java @@ -16,7 +16,7 @@ package android.system; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; /** * Constants and helper functions for use with {@link Os}. diff --git a/luni/src/main/java/android/system/PacketSocketAddress.java b/luni/src/main/java/android/system/PacketSocketAddress.java index ce4081d8c1..c3f15a6301 100644 --- a/luni/src/main/java/android/system/PacketSocketAddress.java +++ b/luni/src/main/java/android/system/PacketSocketAddress.java @@ -16,9 +16,10 @@ package android.system; -import dalvik.annotation.compat.UnsupportedAppUsage; -import libcore.util.Objects; +import android.compat.annotation.UnsupportedAppUsage; + import java.net.SocketAddress; +import libcore.util.Objects; /** * Packet socket address. diff --git a/luni/src/main/java/java/lang/ref/FinalizerReference.java b/luni/src/main/java/java/lang/ref/FinalizerReference.java index 9589a9d0a6..037af4a25b 100644 --- a/luni/src/main/java/java/lang/ref/FinalizerReference.java +++ b/luni/src/main/java/java/lang/ref/FinalizerReference.java @@ -16,7 +16,7 @@ package java.lang.ref; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.optimization.FastNative; /** diff --git a/luni/src/main/java/java/net/AddressCache.java b/luni/src/main/java/java/net/AddressCache.java index ac5a029247..3026923179 100644 --- a/luni/src/main/java/java/net/AddressCache.java +++ b/luni/src/main/java/java/net/AddressCache.java @@ -16,7 +16,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import libcore.util.BasicLruCache; /** diff --git a/luni/src/main/java/java/nio/NIOAccess.java b/luni/src/main/java/java/nio/NIOAccess.java index 7a07e3d307..81b205d3fb 100644 --- a/luni/src/main/java/java/nio/NIOAccess.java +++ b/luni/src/main/java/java/nio/NIOAccess.java @@ -16,7 +16,7 @@ package java.nio; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; /** * This class is used via JNI by code in frameworks/base/. diff --git a/luni/src/main/java/java/nio/NioUtils.java b/luni/src/main/java/java/nio/NioUtils.java index 657be6e9a6..aca91b0291 100644 --- a/luni/src/main/java/java/nio/NioUtils.java +++ b/luni/src/main/java/java/nio/NioUtils.java @@ -16,19 +16,19 @@ package java.nio; +import android.compat.annotation.UnsupportedAppUsage; + import java.io.Closeable; import java.io.FileDescriptor; -import java.io.IOException; -import java.nio.channels.ClosedChannelException; import java.nio.channels.FileChannel; -import java.util.Set; -import static android.system.OsConstants.*; -import dalvik.annotation.compat.UnsupportedAppUsage; -import sun.misc.Cleaner; -import sun.nio.ch.DirectBuffer; import sun.nio.ch.FileChannelImpl; +import static android.system.OsConstants.O_ACCMODE; +import static android.system.OsConstants.O_APPEND; +import static android.system.OsConstants.O_RDONLY; +import static android.system.OsConstants.O_WRONLY; + /** * @hide internal use only */ diff --git a/luni/src/main/java/libcore/icu/DateIntervalFormat.java b/luni/src/main/java/libcore/icu/DateIntervalFormat.java index 9a4f9a0f6f..74aca081c0 100644 --- a/luni/src/main/java/libcore/icu/DateIntervalFormat.java +++ b/luni/src/main/java/libcore/icu/DateIntervalFormat.java @@ -16,10 +16,10 @@ package libcore.icu; +import android.compat.annotation.UnsupportedAppUsage; import android.icu.util.Calendar; import android.icu.util.ULocale; -import dalvik.annotation.compat.UnsupportedAppUsage; import java.text.FieldPosition; import java.util.TimeZone; import libcore.util.BasicLruCache; diff --git a/luni/src/main/java/libcore/icu/ICU.java b/luni/src/main/java/libcore/icu/ICU.java index 53a35588ae..f6e5fed3ad 100644 --- a/luni/src/main/java/libcore/icu/ICU.java +++ b/luni/src/main/java/libcore/icu/ICU.java @@ -16,8 +16,9 @@ package libcore.icu; +import android.compat.annotation.UnsupportedAppUsage; import android.icu.util.ULocale; -import dalvik.annotation.compat.UnsupportedAppUsage; + import java.util.Collections; import java.util.HashMap; import java.util.HashSet; diff --git a/luni/src/main/java/libcore/icu/LocaleData.java b/luni/src/main/java/libcore/icu/LocaleData.java index cf3fec0115..ea6fe6fe91 100644 --- a/luni/src/main/java/libcore/icu/LocaleData.java +++ b/luni/src/main/java/libcore/icu/LocaleData.java @@ -16,11 +16,12 @@ package libcore.icu; +import android.compat.annotation.UnsupportedAppUsage; import android.icu.impl.ICUData; import android.icu.impl.ICUResourceBundle; import android.icu.text.NumberingSystem; import android.icu.util.UResourceBundle; -import dalvik.annotation.compat.UnsupportedAppUsage; + import java.text.DateFormat; import java.util.HashMap; import java.util.Locale; diff --git a/luni/src/main/java/libcore/io/AsynchronousCloseMonitor.java b/luni/src/main/java/libcore/io/AsynchronousCloseMonitor.java index 76ef5e448f..adb193de91 100644 --- a/luni/src/main/java/libcore/io/AsynchronousCloseMonitor.java +++ b/luni/src/main/java/libcore/io/AsynchronousCloseMonitor.java @@ -16,7 +16,7 @@ package libcore.io; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.io.FileDescriptor; public final class AsynchronousCloseMonitor { diff --git a/luni/src/main/java/libcore/io/BlockGuardOs.java b/luni/src/main/java/libcore/io/BlockGuardOs.java index bd95a93b8d..f3793d6ed2 100644 --- a/luni/src/main/java/libcore/io/BlockGuardOs.java +++ b/luni/src/main/java/libcore/io/BlockGuardOs.java @@ -16,6 +16,7 @@ package libcore.io; +import android.compat.annotation.UnsupportedAppUsage; import android.system.ErrnoException; import android.system.GaiException; import android.system.Int64Ref; @@ -25,9 +26,7 @@ import android.system.StructLinger; import android.system.StructPollfd; import android.system.StructStat; import android.system.StructStatVfs; -import dalvik.annotation.compat.UnsupportedAppUsage; -import dalvik.system.BlockGuard; -import dalvik.system.SocketTagger; + import java.io.FileDescriptor; import java.io.InterruptedIOException; import java.net.InetAddress; @@ -36,6 +35,9 @@ import java.net.SocketAddress; import java.net.SocketException; import java.nio.ByteBuffer; +import dalvik.system.BlockGuard; +import dalvik.system.SocketTagger; + import static android.system.OsConstants.*; /** diff --git a/luni/src/main/java/libcore/io/BufferIterator.java b/luni/src/main/java/libcore/io/BufferIterator.java index 97890c323f..fb97250912 100644 --- a/luni/src/main/java/libcore/io/BufferIterator.java +++ b/luni/src/main/java/libcore/io/BufferIterator.java @@ -16,7 +16,7 @@ package libcore.io; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; /** * Iterates over big- or little-endian bytes. See {@link MemoryMappedFile#bigEndianIterator} and diff --git a/luni/src/main/java/libcore/io/ForwardingOs.java b/luni/src/main/java/libcore/io/ForwardingOs.java index c75f94e4ad..f9fb2d43dd 100644 --- a/luni/src/main/java/libcore/io/ForwardingOs.java +++ b/luni/src/main/java/libcore/io/ForwardingOs.java @@ -35,7 +35,7 @@ import android.system.StructTimeval; import android.system.StructUcred; import android.system.StructUtsname; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.io.FileDescriptor; import java.io.InterruptedIOException; import java.net.InetAddress; diff --git a/luni/src/main/java/libcore/io/IoBridge.java b/luni/src/main/java/libcore/io/IoBridge.java index 06311767b8..aa66f14d9b 100644 --- a/luni/src/main/java/libcore/io/IoBridge.java +++ b/luni/src/main/java/libcore/io/IoBridge.java @@ -16,6 +16,7 @@ package libcore.io; +import android.compat.annotation.UnsupportedAppUsage; import android.system.ErrnoException; import android.system.Int32Ref; import android.system.StructGroupReq; @@ -23,9 +24,6 @@ import android.system.StructLinger; import android.system.StructPollfd; import android.system.StructTimeval; -import libcore.util.ArrayUtils; - -import dalvik.annotation.compat.UnsupportedAppUsage; import java.io.FileDescriptor; import java.io.FileNotFoundException; import java.io.IOException; @@ -46,6 +44,7 @@ import java.net.SocketTimeoutException; import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.util.concurrent.TimeUnit; +import libcore.util.ArrayUtils; import static android.system.OsConstants.*; diff --git a/luni/src/main/java/libcore/io/IoUtils.java b/luni/src/main/java/libcore/io/IoUtils.java index 72a2d3d863..4b4870b1b9 100644 --- a/luni/src/main/java/libcore/io/IoUtils.java +++ b/luni/src/main/java/libcore/io/IoUtils.java @@ -16,8 +16,10 @@ package libcore.io; +import android.compat.annotation.UnsupportedAppUsage; import android.system.ErrnoException; import android.system.StructStat; + import java.io.File; import java.io.FileDescriptor; import java.io.FileNotFoundException; @@ -27,10 +29,12 @@ import java.net.Socket; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Objects; - -import dalvik.annotation.compat.UnsupportedAppUsage; import libcore.util.NonNull; -import static android.system.OsConstants.*; + +import static android.system.OsConstants.F_GETFL; +import static android.system.OsConstants.F_SETFL; +import static android.system.OsConstants.O_NONBLOCK; +import static android.system.OsConstants.O_RDONLY; /** @hide */ @libcore.api.CorePlatformApi diff --git a/luni/src/main/java/libcore/io/Libcore.java b/luni/src/main/java/libcore/io/Libcore.java index 823d8668ac..29b5f7fda7 100644 --- a/luni/src/main/java/libcore/io/Libcore.java +++ b/luni/src/main/java/libcore/io/Libcore.java @@ -16,7 +16,7 @@ package libcore.io; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.util.Objects; /** @hide */ diff --git a/luni/src/main/java/libcore/io/Memory.java b/luni/src/main/java/libcore/io/Memory.java index 40423002a3..9e7f4ea5c8 100644 --- a/luni/src/main/java/libcore/io/Memory.java +++ b/luni/src/main/java/libcore/io/Memory.java @@ -17,13 +17,12 @@ package libcore.io; -import dalvik.annotation.compat.UnsupportedAppUsage; -import dalvik.annotation.optimization.FastNative; -import java.io.FileDescriptor; -import java.io.IOException; -import java.nio.ByteBuffer; +import android.compat.annotation.UnsupportedAppUsage; + import java.nio.ByteOrder; +import dalvik.annotation.optimization.FastNative; + /** * Unsafe access to memory. * diff --git a/luni/src/main/java/libcore/io/MemoryMappedFile.java b/luni/src/main/java/libcore/io/MemoryMappedFile.java index 20b08e5779..5e003ea5e1 100644 --- a/luni/src/main/java/libcore/io/MemoryMappedFile.java +++ b/luni/src/main/java/libcore/io/MemoryMappedFile.java @@ -16,17 +16,15 @@ package libcore.io; +import android.compat.annotation.UnsupportedAppUsage; import android.system.ErrnoException; -import dalvik.annotation.compat.UnsupportedAppUsage; + import java.io.FileDescriptor; -import java.io.IOException; -import java.io.RandomAccessFile; import java.nio.ByteOrder; -import java.nio.channels.FileChannel; -import java.nio.NioUtils; -import libcore.io.Libcore; -import libcore.io.Memory; -import static android.system.OsConstants.*; + +import static android.system.OsConstants.MAP_SHARED; +import static android.system.OsConstants.O_RDONLY; +import static android.system.OsConstants.PROT_READ; /** * A memory-mapped file. Use {@link #mmapRO} to map a file, {@link #close} to unmap a file, diff --git a/luni/src/main/java/libcore/io/Os.java b/luni/src/main/java/libcore/io/Os.java index 048a973778..4953186d45 100644 --- a/luni/src/main/java/libcore/io/Os.java +++ b/luni/src/main/java/libcore/io/Os.java @@ -35,7 +35,7 @@ import android.system.StructTimeval; import android.system.StructUcred; import android.system.StructUtsname; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.io.FileDescriptor; import java.io.InterruptedIOException; import java.net.InetAddress; diff --git a/luni/src/main/java/libcore/io/Streams.java b/luni/src/main/java/libcore/io/Streams.java index 427439915d..f83f5c1101 100644 --- a/luni/src/main/java/libcore/io/Streams.java +++ b/luni/src/main/java/libcore/io/Streams.java @@ -16,9 +16,8 @@ package libcore.io; -import libcore.util.ArrayUtils; +import android.compat.annotation.UnsupportedAppUsage; -import dalvik.annotation.compat.UnsupportedAppUsage; import java.io.ByteArrayOutputStream; import java.io.EOFException; import java.io.IOException; @@ -27,6 +26,7 @@ import java.io.OutputStream; import java.io.Reader; import java.io.StringWriter; import java.util.concurrent.atomic.AtomicReference; +import libcore.util.ArrayUtils; /** @hide */ @libcore.api.CorePlatformApi diff --git a/luni/src/main/java/libcore/net/NetworkSecurityPolicy.java b/luni/src/main/java/libcore/net/NetworkSecurityPolicy.java index 3a3a5d99a3..1ce58d9e48 100644 --- a/luni/src/main/java/libcore/net/NetworkSecurityPolicy.java +++ b/luni/src/main/java/libcore/net/NetworkSecurityPolicy.java @@ -16,7 +16,7 @@ package libcore.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; /** * Network security policy for this process/application. diff --git a/luni/src/main/java/libcore/net/event/NetworkEventDispatcher.java b/luni/src/main/java/libcore/net/event/NetworkEventDispatcher.java index 5399e8966c..4c2aceeeac 100644 --- a/luni/src/main/java/libcore/net/event/NetworkEventDispatcher.java +++ b/luni/src/main/java/libcore/net/event/NetworkEventDispatcher.java @@ -16,7 +16,7 @@ package libcore.net.event; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/luni/src/main/java/libcore/net/event/NetworkEventListener.java b/luni/src/main/java/libcore/net/event/NetworkEventListener.java index d7d011b4e7..07c62c5ecd 100644 --- a/luni/src/main/java/libcore/net/event/NetworkEventListener.java +++ b/luni/src/main/java/libcore/net/event/NetworkEventListener.java @@ -16,7 +16,7 @@ package libcore.net.event; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; /** * A base class for objects interested in network events. diff --git a/luni/src/main/java/libcore/net/http/HttpDate.java b/luni/src/main/java/libcore/net/http/HttpDate.java index c295503757..de05ceacb1 100644 --- a/luni/src/main/java/libcore/net/http/HttpDate.java +++ b/luni/src/main/java/libcore/net/http/HttpDate.java @@ -16,7 +16,7 @@ package libcore.net.http; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/luni/src/main/java/libcore/util/BasicLruCache.java b/luni/src/main/java/libcore/util/BasicLruCache.java index 20a3bee0d5..e3ddc6437d 100644 --- a/luni/src/main/java/libcore/util/BasicLruCache.java +++ b/luni/src/main/java/libcore/util/BasicLruCache.java @@ -16,7 +16,7 @@ package libcore.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.util.LinkedHashMap; import java.util.Map; diff --git a/luni/src/main/java/libcore/util/EmptyArray.java b/luni/src/main/java/libcore/util/EmptyArray.java index 592b633ce6..0d1e3217d6 100644 --- a/luni/src/main/java/libcore/util/EmptyArray.java +++ b/luni/src/main/java/libcore/util/EmptyArray.java @@ -16,7 +16,7 @@ package libcore.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.compat.VersionCodes; /** @hide */ diff --git a/luni/src/main/java/libcore/util/ZoneInfo.java b/luni/src/main/java/libcore/util/ZoneInfo.java index 48665cac14..88796dd51a 100644 --- a/luni/src/main/java/libcore/util/ZoneInfo.java +++ b/luni/src/main/java/libcore/util/ZoneInfo.java @@ -22,7 +22,8 @@ */ package libcore.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; + import java.io.IOException; import java.io.ObjectInputStream; import java.util.Arrays; diff --git a/luni/src/main/java/org/apache/harmony/xml/ExpatAttributes.java b/luni/src/main/java/org/apache/harmony/xml/ExpatAttributes.java index 3368f9214c..22ee4a2f59 100644 --- a/luni/src/main/java/org/apache/harmony/xml/ExpatAttributes.java +++ b/luni/src/main/java/org/apache/harmony/xml/ExpatAttributes.java @@ -16,9 +16,10 @@ package org.apache.harmony.xml; -import dalvik.annotation.compat.UnsupportedAppUsage; import org.xml.sax.Attributes; +import android.compat.annotation.UnsupportedAppUsage; + /** * Wraps native attribute array. */ diff --git a/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java b/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java index 71c94f9e28..8872e1d1fb 100644 --- a/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java +++ b/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java @@ -16,15 +16,6 @@ package org.apache.harmony.xml; -import dalvik.annotation.compat.UnsupportedAppUsage; -import dalvik.annotation.optimization.ReachabilitySensitive; -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; -import java.net.URI; -import java.net.URL; -import java.net.URLConnection; -import libcore.io.IoUtils; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.DTDHandler; @@ -35,6 +26,18 @@ import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.ext.LexicalHandler; +import android.compat.annotation.UnsupportedAppUsage; + +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.net.URI; +import java.net.URL; +import java.net.URLConnection; +import libcore.io.IoUtils; + +import dalvik.annotation.optimization.ReachabilitySensitive; + /** * Adapts SAX API to the Expat native XML parser. Not intended for reuse * across documents. diff --git a/luni/src/main/java/org/apache/harmony/xml/ExpatReader.java b/luni/src/main/java/org/apache/harmony/xml/ExpatReader.java index 510a889b3a..a69f364e93 100644 --- a/luni/src/main/java/org/apache/harmony/xml/ExpatReader.java +++ b/luni/src/main/java/org/apache/harmony/xml/ExpatReader.java @@ -16,11 +16,6 @@ package org.apache.harmony.xml; -import dalvik.annotation.compat.UnsupportedAppUsage; -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; -import libcore.io.IoUtils; import org.xml.sax.ContentHandler; import org.xml.sax.DTDHandler; import org.xml.sax.EntityResolver; @@ -32,6 +27,13 @@ import org.xml.sax.SAXNotSupportedException; import org.xml.sax.XMLReader; import org.xml.sax.ext.LexicalHandler; +import android.compat.annotation.UnsupportedAppUsage; + +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import libcore.io.IoUtils; + /** * SAX wrapper around Expat. Interns strings. Does not support validation. * Does not support {@link DTDHandler}. diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java index a0da24d602..b522265568 100644 --- a/luni/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java +++ b/luni/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java @@ -16,10 +16,6 @@ package org.apache.harmony.xml.dom; -import dalvik.annotation.compat.UnsupportedAppUsage; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; import org.w3c.dom.Element; @@ -28,6 +24,12 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.TypeInfo; +import android.compat.annotation.UnsupportedAppUsage; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + /** * Provides a straightforward implementation of the corresponding W3C DOM * interface. The class is used internally only, thus only notable members that diff --git a/luni/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java b/luni/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java index 554807c619..9f22f2b4cb 100644 --- a/luni/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java +++ b/luni/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java @@ -12,9 +12,10 @@ package org.w3c.dom.ls; -import dalvik.annotation.compat.UnsupportedAppUsage; import org.w3c.dom.traversal.NodeFilter; +import android.compat.annotation.UnsupportedAppUsage; + /** * <code>LSSerializerFilter</code>s provide applications the ability to * examine nodes as they are being serialized and decide what nodes should diff --git a/luni/src/main/java/org/w3c/dom/traversal/NodeFilter.java b/luni/src/main/java/org/w3c/dom/traversal/NodeFilter.java index 24f75993fb..8263d5bd36 100644 --- a/luni/src/main/java/org/w3c/dom/traversal/NodeFilter.java +++ b/luni/src/main/java/org/w3c/dom/traversal/NodeFilter.java @@ -12,9 +12,10 @@ package org.w3c.dom.traversal; -import dalvik.annotation.compat.UnsupportedAppUsage; import org.w3c.dom.Node; +import android.compat.annotation.UnsupportedAppUsage; + /** * Filters are objects that know how to "filter out" nodes. If a * <code>NodeIterator</code> or <code>TreeWalker</code> is given a diff --git a/luni/src/main/java/org/w3c/dom/traversal/NodeIterator.java b/luni/src/main/java/org/w3c/dom/traversal/NodeIterator.java index 686beb7726..3d1f3af890 100644 --- a/luni/src/main/java/org/w3c/dom/traversal/NodeIterator.java +++ b/luni/src/main/java/org/w3c/dom/traversal/NodeIterator.java @@ -12,10 +12,11 @@ package org.w3c.dom.traversal; -import dalvik.annotation.compat.UnsupportedAppUsage; import org.w3c.dom.DOMException; import org.w3c.dom.Node; +import android.compat.annotation.UnsupportedAppUsage; + /** * <code>NodeIterators</code> are used to step through a set of nodes, e.g. * the set of nodes in a <code>NodeList</code>, the document subtree diff --git a/luni/src/main/java/org/xml/sax/InputSource.java b/luni/src/main/java/org/xml/sax/InputSource.java index 3750cfed29..26e027bbfa 100644 --- a/luni/src/main/java/org/xml/sax/InputSource.java +++ b/luni/src/main/java/org/xml/sax/InputSource.java @@ -5,7 +5,7 @@ package org.xml.sax; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.io.InputStream; import java.io.Reader; diff --git a/luni/src/main/java/org/xml/sax/SAXException.java b/luni/src/main/java/org/xml/sax/SAXException.java index ea69d3f2eb..383b4a0569 100644 --- a/luni/src/main/java/org/xml/sax/SAXException.java +++ b/luni/src/main/java/org/xml/sax/SAXException.java @@ -5,7 +5,7 @@ package org.xml.sax; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; /** * Encapsulate a general SAX error or warning. diff --git a/luni/src/main/java/org/xml/sax/SAXParseException.java b/luni/src/main/java/org/xml/sax/SAXParseException.java index 72b16cf904..67cb78a95c 100644 --- a/luni/src/main/java/org/xml/sax/SAXParseException.java +++ b/luni/src/main/java/org/xml/sax/SAXParseException.java @@ -5,7 +5,7 @@ package org.xml.sax; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; /** * Encapsulate an XML parse error or warning. diff --git a/luni/src/main/java/org/xml/sax/ext/Attributes2Impl.java b/luni/src/main/java/org/xml/sax/ext/Attributes2Impl.java index b3702a4844..6b4ea18d4e 100644 --- a/luni/src/main/java/org/xml/sax/ext/Attributes2Impl.java +++ b/luni/src/main/java/org/xml/sax/ext/Attributes2Impl.java @@ -5,11 +5,13 @@ package org.xml.sax.ext; -import dalvik.annotation.compat.UnsupportedAppUsage; -import libcore.util.EmptyArray; import org.xml.sax.Attributes; import org.xml.sax.helpers.AttributesImpl; +import android.compat.annotation.UnsupportedAppUsage; + +import libcore.util.EmptyArray; + /** * SAX2 extension helper for additional Attributes information, * implementing the {@link Attributes2} interface. diff --git a/luni/src/main/java/org/xml/sax/ext/Locator2Impl.java b/luni/src/main/java/org/xml/sax/ext/Locator2Impl.java index bb9582f02a..711639b8f7 100644 --- a/luni/src/main/java/org/xml/sax/ext/Locator2Impl.java +++ b/luni/src/main/java/org/xml/sax/ext/Locator2Impl.java @@ -5,10 +5,11 @@ package org.xml.sax.ext; -import dalvik.annotation.compat.UnsupportedAppUsage; import org.xml.sax.Locator; import org.xml.sax.helpers.LocatorImpl; +import android.compat.annotation.UnsupportedAppUsage; + /** * SAX2 extension helper for holding additional Entity information, diff --git a/luni/src/main/java/org/xml/sax/helpers/AttributesImpl.java b/luni/src/main/java/org/xml/sax/helpers/AttributesImpl.java index 9193075bb9..dcc6ff038b 100644 --- a/luni/src/main/java/org/xml/sax/helpers/AttributesImpl.java +++ b/luni/src/main/java/org/xml/sax/helpers/AttributesImpl.java @@ -6,9 +6,10 @@ package org.xml.sax.helpers; -import dalvik.annotation.compat.UnsupportedAppUsage; import org.xml.sax.Attributes; +import android.compat.annotation.UnsupportedAppUsage; + /** * Default implementation of the Attributes interface. diff --git a/luni/src/main/java/org/xml/sax/helpers/LocatorImpl.java b/luni/src/main/java/org/xml/sax/helpers/LocatorImpl.java index 944c41aa87..9997375d4d 100644 --- a/luni/src/main/java/org/xml/sax/helpers/LocatorImpl.java +++ b/luni/src/main/java/org/xml/sax/helpers/LocatorImpl.java @@ -5,9 +5,10 @@ package org.xml.sax.helpers; -import dalvik.annotation.compat.UnsupportedAppUsage; import org.xml.sax.Locator; +import android.compat.annotation.UnsupportedAppUsage; + /** * Provide an optional convenience implementation of Locator. diff --git a/luni/src/main/java/org/xml/sax/helpers/NamespaceSupport.java b/luni/src/main/java/org/xml/sax/helpers/NamespaceSupport.java index 820f8d275a..5322467dac 100644 --- a/luni/src/main/java/org/xml/sax/helpers/NamespaceSupport.java +++ b/luni/src/main/java/org/xml/sax/helpers/NamespaceSupport.java @@ -6,7 +6,7 @@ package org.xml.sax.helpers; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.util.ArrayList; import java.util.Collections; import java.util.EmptyStackException; diff --git a/luni/src/main/java/org/xml/sax/helpers/ParserAdapter.java b/luni/src/main/java/org/xml/sax/helpers/ParserAdapter.java index 5acc659ae6..f6a7a519d3 100644 --- a/luni/src/main/java/org/xml/sax/helpers/ParserAdapter.java +++ b/luni/src/main/java/org/xml/sax/helpers/ParserAdapter.java @@ -6,10 +6,6 @@ package org.xml.sax.helpers; -import dalvik.annotation.compat.UnsupportedAppUsage; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Enumeration; import org.xml.sax.AttributeList; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; @@ -26,6 +22,12 @@ import org.xml.sax.SAXNotSupportedException; import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; +import android.compat.annotation.UnsupportedAppUsage; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Enumeration; + /** * Adapt a SAX1 Parser as a SAX2 XMLReader. diff --git a/luni/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java b/luni/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java index 95ae356354..9ad32af28c 100644 --- a/luni/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java +++ b/luni/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java @@ -6,8 +6,6 @@ package org.xml.sax.helpers; -import dalvik.annotation.compat.UnsupportedAppUsage; -import java.io.IOException; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.DTDHandler; @@ -22,6 +20,10 @@ import org.xml.sax.SAXParseException; import org.xml.sax.XMLFilter; import org.xml.sax.XMLReader; +import android.compat.annotation.UnsupportedAppUsage; + +import java.io.IOException; + /** * Base class for deriving an XML filter. diff --git a/luni/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java b/luni/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java index 0ef4d6fca1..5f0789fbcb 100644 --- a/luni/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java +++ b/luni/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java @@ -6,9 +6,6 @@ package org.xml.sax.helpers; -import dalvik.annotation.compat.UnsupportedAppUsage; -import java.io.IOException; -import java.util.Locale; import org.xml.sax.AttributeList; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; @@ -23,6 +20,11 @@ import org.xml.sax.SAXException; import org.xml.sax.SAXNotSupportedException; import org.xml.sax.XMLReader; +import android.compat.annotation.UnsupportedAppUsage; + +import java.io.IOException; +import java.util.Locale; + /** * Adapt a SAX2 XMLReader as a SAX1 Parser. diff --git a/luni/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java b/luni/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java index b95728f944..08d1664079 100644 --- a/luni/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java +++ b/luni/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java @@ -7,13 +7,15 @@ package org.xml.sax.helpers; -import dalvik.annotation.compat.UnsupportedAppUsage; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; + +import android.compat.annotation.UnsupportedAppUsage; + import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; /** diff --git a/mmodules/core_platform_api/api/platform/current-api.txt b/mmodules/core_platform_api/api/platform/current-api.txt index 214d5f00e7..a6431fb23e 100644 --- a/mmodules/core_platform_api/api/platform/current-api.txt +++ b/mmodules/core_platform_api/api/platform/current-api.txt @@ -32,11 +32,11 @@ package android.system { public class Int32Ref { ctor public Int32Ref(int); - field @dalvik.annotation.compat.UnsupportedAppUsage public int value; + field public int value; } public final class NetlinkSocketAddress extends java.net.SocketAddress { - ctor @dalvik.annotation.compat.UnsupportedAppUsage public NetlinkSocketAddress(int, int); + ctor public NetlinkSocketAddress(int, int); method public int getGroupsMask(); method public int getPortId(); } @@ -55,31 +55,31 @@ package android.system { method public static void setpgid(int, int) throws android.system.ErrnoException; method public static void setregid(int, int) throws android.system.ErrnoException; method public static void setreuid(int, int) throws android.system.ErrnoException; - method @dalvik.annotation.compat.UnsupportedAppUsage public static void setsockoptIfreq(java.io.FileDescriptor, int, int, String) throws android.system.ErrnoException; + method public static void setsockoptIfreq(java.io.FileDescriptor, int, int, String) throws android.system.ErrnoException; method public static void setsockoptLinger(java.io.FileDescriptor, int, int, android.system.StructLinger) throws android.system.ErrnoException; method public static long splice(java.io.FileDescriptor, android.system.Int64Ref, java.io.FileDescriptor, android.system.Int64Ref, long, int) throws android.system.ErrnoException; method public static void unlink(String) throws android.system.ErrnoException; } public final class OsConstants { - method @dalvik.annotation.compat.UnsupportedAppUsage public static int CAP_TO_INDEX(int); - method @dalvik.annotation.compat.UnsupportedAppUsage public static int CAP_TO_MASK(int); - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int ARPHRD_LOOPBACK; - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int ENONET; - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int EUSERS; - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int MAP_POPULATE; - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int O_DIRECT; - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int PR_CAP_AMBIENT; - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int PR_CAP_AMBIENT_RAISE; - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int RLIMIT_NOFILE; - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int RTMGRP_IPV4_IFADDR; - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int SPLICE_F_MORE; - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int SPLICE_F_MOVE; - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int TIOCOUTQ; - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int UDP_ENCAP; - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int UDP_ENCAP_ESPINUDP; - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int XATTR_CREATE; - field @dalvik.annotation.compat.UnsupportedAppUsage public static final int _LINUX_CAPABILITY_VERSION_3; + method public static int CAP_TO_INDEX(int); + method public static int CAP_TO_MASK(int); + field public static final int ARPHRD_LOOPBACK; + field public static final int ENONET; + field public static final int EUSERS; + field public static final int MAP_POPULATE; + field public static final int O_DIRECT; + field public static final int PR_CAP_AMBIENT; + field public static final int PR_CAP_AMBIENT_RAISE; + field public static final int RLIMIT_NOFILE; + field public static final int RTMGRP_IPV4_IFADDR; + field public static final int SPLICE_F_MORE; + field public static final int SPLICE_F_MOVE; + field public static final int TIOCOUTQ; + field public static final int UDP_ENCAP; + field public static final int UDP_ENCAP_ESPINUDP; + field public static final int XATTR_CREATE; + field public static final int _LINUX_CAPABILITY_VERSION_3; } public final class PacketSocketAddress extends java.net.SocketAddress { @@ -542,9 +542,9 @@ package dalvik.system { } public class BaseDexClassLoader extends java.lang.ClassLoader { - method @dalvik.annotation.compat.UnsupportedAppUsage public void addDexPath(String); + method public void addDexPath(String); method public void addNativePath(java.util.Collection<java.lang.String>); - method @dalvik.annotation.compat.UnsupportedAppUsage public String getLdLibraryPath(); + method public String getLdLibraryPath(); method public static void setReporter(dalvik.system.BaseDexClassLoader.Reporter); } @@ -553,17 +553,17 @@ package dalvik.system { } public final class BlockGuard { - method @NonNull @dalvik.annotation.compat.UnsupportedAppUsage public static dalvik.system.BlockGuard.Policy getThreadPolicy(); + method @NonNull public static dalvik.system.BlockGuard.Policy getThreadPolicy(); method @NonNull public static dalvik.system.BlockGuard.VmPolicy getVmPolicy(); - method @dalvik.annotation.compat.UnsupportedAppUsage public static void setThreadPolicy(@NonNull dalvik.system.BlockGuard.Policy); + method public static void setThreadPolicy(@NonNull dalvik.system.BlockGuard.Policy); method public static void setVmPolicy(@NonNull dalvik.system.BlockGuard.VmPolicy); - field @dalvik.annotation.compat.UnsupportedAppUsage public static final dalvik.system.BlockGuard.Policy LAX_POLICY; + field public static final dalvik.system.BlockGuard.Policy LAX_POLICY; field public static final dalvik.system.BlockGuard.VmPolicy LAX_VM_POLICY; } public static interface BlockGuard.Policy { method public int getPolicyMask(); - method @dalvik.annotation.compat.UnsupportedAppUsage public void onReadFromDisk(); + method public void onReadFromDisk(); method public void onUnbufferedIO(); method public void onWriteToDisk(); } @@ -573,17 +573,17 @@ package dalvik.system { } public final class CloseGuard { - method @dalvik.annotation.compat.UnsupportedAppUsage public void close(); - method @dalvik.annotation.compat.UnsupportedAppUsage(trackingBug=111170242) public static dalvik.system.CloseGuard get(); + method public void close(); + method public static dalvik.system.CloseGuard get(); method public static dalvik.system.CloseGuard.Reporter getReporter(); - method @dalvik.annotation.compat.UnsupportedAppUsage(trackingBug=111170242) public void open(String); - method @dalvik.annotation.compat.UnsupportedAppUsage public static void setEnabled(boolean); - method @dalvik.annotation.compat.UnsupportedAppUsage public static void setReporter(dalvik.system.CloseGuard.Reporter); - method @dalvik.annotation.compat.UnsupportedAppUsage(trackingBug=111170242) public void warnIfOpen(); + method public void open(String); + method public static void setEnabled(boolean); + method public static void setReporter(dalvik.system.CloseGuard.Reporter); + method public void warnIfOpen(); } public static interface CloseGuard.Reporter { - method @dalvik.annotation.compat.UnsupportedAppUsage public void report(String, Throwable); + method public void report(String, Throwable); } public interface DalvikLogHandler { @@ -633,13 +633,13 @@ package dalvik.system { public abstract class SocketTagger { ctor public SocketTagger(); - method @dalvik.annotation.compat.UnsupportedAppUsage public static dalvik.system.SocketTagger get(); + method public static dalvik.system.SocketTagger get(); method public static void set(dalvik.system.SocketTagger); method public abstract void tag(java.io.FileDescriptor) throws java.net.SocketException; - method @dalvik.annotation.compat.UnsupportedAppUsage public final void tag(java.net.Socket) throws java.net.SocketException; + method public final void tag(java.net.Socket) throws java.net.SocketException; method public final void tag(java.net.DatagramSocket) throws java.net.SocketException; method public abstract void untag(java.io.FileDescriptor) throws java.net.SocketException; - method @dalvik.annotation.compat.UnsupportedAppUsage public final void untag(java.net.Socket) throws java.net.SocketException; + method public final void untag(java.net.Socket) throws java.net.SocketException; method public final void untag(java.net.DatagramSocket) throws java.net.SocketException; } @@ -651,14 +651,14 @@ package dalvik.system { method public static void dumpHprofData(String) throws java.io.IOException; method public static void dumpHprofData(String, java.io.FileDescriptor) throws java.io.IOException; method public static void dumpHprofDataDdms(); - method @dalvik.annotation.compat.UnsupportedAppUsage public static void dumpReferenceTables(); + method public static void dumpReferenceTables(); method public static int getAllocCount(int); method @dalvik.annotation.optimization.FastNative public static int getLoadedClassCount(); method public static int getMethodTracingMode(); method public static String getRuntimeStat(String); method public static java.util.Map<java.lang.String,java.lang.String> getRuntimeStats(); method public static String[] getVmFeatureList(); - method @dalvik.annotation.compat.UnsupportedAppUsage @dalvik.annotation.optimization.FastNative public static boolean isDebuggerConnected(); + method @dalvik.annotation.optimization.FastNative public static boolean isDebuggerConnected(); method @dalvik.annotation.optimization.FastNative public static boolean isDebuggingEnabled(); method @dalvik.annotation.optimization.FastNative public static long lastDebuggerActivity(); method @dalvik.annotation.optimization.FastNative public static void printLoadedClasses(int); @@ -688,33 +688,33 @@ package dalvik.system { } public final class VMRuntime { - method @dalvik.annotation.compat.UnsupportedAppUsage @dalvik.annotation.optimization.FastNative public long addressOf(Object); + method @dalvik.annotation.optimization.FastNative public long addressOf(Object); method public static void bootCompleted(); method public void clampGrowthLimit(); - method @dalvik.annotation.compat.UnsupportedAppUsage public void clearGrowthLimit(); + method public void clearGrowthLimit(); method public static boolean didPruneDalvikCache(); method public void disableJitCompilation(); - method @dalvik.annotation.compat.UnsupportedAppUsage public static String getCurrentInstructionSet(); - method @dalvik.annotation.compat.UnsupportedAppUsage public static String getInstructionSet(String); - method @dalvik.annotation.compat.UnsupportedAppUsage public static dalvik.system.VMRuntime getRuntime(); + method public static String getCurrentInstructionSet(); + method public static String getInstructionSet(String); + method public static dalvik.system.VMRuntime getRuntime(); method public float getTargetHeapUtilization(); method public int getTargetSdkVersion(); method @dalvik.annotation.optimization.FastNative public static boolean hasBootImageSpaces(); - method @dalvik.annotation.compat.UnsupportedAppUsage @dalvik.annotation.optimization.FastNative public boolean is64Bit(); - method @dalvik.annotation.compat.UnsupportedAppUsage public static boolean is64BitAbi(String); + method @dalvik.annotation.optimization.FastNative public boolean is64Bit(); + method public static boolean is64BitAbi(String); method public static boolean is64BitInstructionSet(String); method public static boolean isBootClassPathOnDisk(String); method @dalvik.annotation.optimization.FastNative public boolean isCheckJniEnabled(); method @dalvik.annotation.optimization.FastNative public boolean isNativeDebuggable(); - method @dalvik.annotation.compat.UnsupportedAppUsage @dalvik.annotation.optimization.FastNative public Object newNonMovableArray(Class<?>, int); + method @dalvik.annotation.optimization.FastNative public Object newNonMovableArray(Class<?>, int); method @dalvik.annotation.optimization.FastNative public Object newUnpaddedArray(Class<?>, int); method public void notifyStartupCompleted(); method public void preloadDexCaches(); method public static void registerAppInfo(String, String[]); - method @dalvik.annotation.compat.UnsupportedAppUsage public void registerNativeAllocation(long); - method @Deprecated @dalvik.annotation.compat.UnsupportedAppUsage public void registerNativeAllocation(int); - method @dalvik.annotation.compat.UnsupportedAppUsage public void registerNativeFree(long); - method @Deprecated @dalvik.annotation.compat.UnsupportedAppUsage public void registerNativeFree(int); + method public void registerNativeAllocation(long); + method @Deprecated public void registerNativeAllocation(int); + method public void registerNativeFree(long); + method @Deprecated public void registerNativeFree(int); method public static void registerSensitiveThread(); method public void requestConcurrentGC(); method public static void resetJitCounters(); @@ -725,12 +725,12 @@ package dalvik.system { method public static void setNonSdkApiUsageConsumer(java.util.function.Consumer<java.lang.String>); method public static void setProcessDataDirectory(String); method public static void setProcessPackageName(String); - method @dalvik.annotation.compat.UnsupportedAppUsage public float setTargetHeapUtilization(float); - method @dalvik.annotation.compat.UnsupportedAppUsage(maxTargetSdk=0, publicAlternatives="Use the {@code targetSdkVersion}" + " attribute in the {@code uses-sdk} manifest tag instead.") public void setTargetSdkVersion(int); + method public float setTargetHeapUtilization(float); + method public void setTargetSdkVersion(int); method public void startJitCompilation(); method public void updateProcessState(int); - method @dalvik.annotation.compat.UnsupportedAppUsage public String vmInstructionSet(); - method @dalvik.annotation.compat.UnsupportedAppUsage public String vmLibrary(); + method public String vmInstructionSet(); + method public String vmLibrary(); field public static final int SDK_VERSION_CUR_DEVELOPMENT = 10000; // 0x2710 } @@ -857,9 +857,9 @@ package java.nio { } public final class NioUtils { - method @dalvik.annotation.compat.UnsupportedAppUsage public static void freeDirectBuffer(java.nio.ByteBuffer); - method @dalvik.annotation.compat.UnsupportedAppUsage public static byte[] unsafeArray(java.nio.ByteBuffer); - method @dalvik.annotation.compat.UnsupportedAppUsage public static int unsafeArrayOffset(java.nio.ByteBuffer); + method public static void freeDirectBuffer(java.nio.ByteBuffer); + method public static byte[] unsafeArray(java.nio.ByteBuffer); + method public static int unsafeArrayOffset(java.nio.ByteBuffer); } } @@ -950,40 +950,40 @@ package libcore.content.type { package libcore.icu { public final class DateIntervalFormat { - method @dalvik.annotation.compat.UnsupportedAppUsage public static String formatDateRange(long, long, int, String); + method public static String formatDateRange(long, long, int, String); } public final class ICU { - method @dalvik.annotation.compat.UnsupportedAppUsage public static String getBestDateTimePattern(String, java.util.Locale); - method @dalvik.annotation.compat.UnsupportedAppUsage public static char[] getDateFormatOrder(String); + method public static String getBestDateTimePattern(String, java.util.Locale); + method public static char[] getDateFormatOrder(String); } public final class LocaleData { - method @dalvik.annotation.compat.UnsupportedAppUsage public static libcore.icu.LocaleData get(java.util.Locale); + method public static libcore.icu.LocaleData get(java.util.Locale); method public String getDateFormat(int); field public String[] amPm; - field @dalvik.annotation.compat.UnsupportedAppUsage public Integer firstDayOfWeek; + field public Integer firstDayOfWeek; field public String[] longMonthNames; field public String[] longStandAloneMonthNames; - field @dalvik.annotation.compat.UnsupportedAppUsage public String[] longStandAloneWeekdayNames; + field public String[] longStandAloneWeekdayNames; field public String[] longWeekdayNames; field public String narrowAm; field public String narrowPm; - field @dalvik.annotation.compat.UnsupportedAppUsage public String[] shortMonthNames; - field @dalvik.annotation.compat.UnsupportedAppUsage public String[] shortStandAloneMonthNames; - field @dalvik.annotation.compat.UnsupportedAppUsage public String[] shortStandAloneWeekdayNames; + field public String[] shortMonthNames; + field public String[] shortStandAloneMonthNames; + field public String[] shortStandAloneWeekdayNames; field public String[] shortWeekdayNames; - field @dalvik.annotation.compat.UnsupportedAppUsage public String timeFormat_Hm; + field public String timeFormat_Hm; field public String timeFormat_Hms; - field @dalvik.annotation.compat.UnsupportedAppUsage public String timeFormat_hm; + field public String timeFormat_hm; field public String timeFormat_hms; field public String[] tinyMonthNames; field public String[] tinyStandAloneMonthNames; field public String[] tinyStandAloneWeekdayNames; field public String[] tinyWeekdayNames; - field @dalvik.annotation.compat.UnsupportedAppUsage public String today; + field public String today; field public String yesterday; - field @dalvik.annotation.compat.UnsupportedAppUsage public char zeroDigit; + field public char zeroDigit; } public final class RelativeDateTimeFormatter { @@ -1005,13 +1005,13 @@ package libcore.internal { package libcore.io { public class ForwardingOs implements libcore.io.Os { - ctor @dalvik.annotation.compat.UnsupportedAppUsage protected ForwardingOs(libcore.io.Os); - method @dalvik.annotation.compat.UnsupportedAppUsage public boolean access(String, int) throws android.system.ErrnoException; - method @dalvik.annotation.compat.UnsupportedAppUsage public java.io.FileDescriptor open(String, int, int) throws android.system.ErrnoException; - method @dalvik.annotation.compat.UnsupportedAppUsage public void remove(String) throws android.system.ErrnoException; - method @dalvik.annotation.compat.UnsupportedAppUsage public void rename(String, String) throws android.system.ErrnoException; - method @dalvik.annotation.compat.UnsupportedAppUsage public android.system.StructStat stat(String) throws android.system.ErrnoException; - method @dalvik.annotation.compat.UnsupportedAppUsage public void unlink(String) throws android.system.ErrnoException; + ctor protected ForwardingOs(libcore.io.Os); + method public boolean access(String, int) throws android.system.ErrnoException; + method public java.io.FileDescriptor open(String, int, int) throws android.system.ErrnoException; + method public void remove(String) throws android.system.ErrnoException; + method public void rename(String, String) throws android.system.ErrnoException; + method public android.system.StructStat stat(String) throws android.system.ErrnoException; + method public void unlink(String) throws android.system.ErrnoException; } public final class IoBridge { @@ -1028,13 +1028,13 @@ package libcore.io { public final class IoUtils { method public static int acquireRawFd(@NonNull java.io.FileDescriptor); method public static void close(java.io.FileDescriptor) throws java.io.IOException; - method @dalvik.annotation.compat.UnsupportedAppUsage public static void closeQuietly(AutoCloseable); - method @dalvik.annotation.compat.UnsupportedAppUsage public static void closeQuietly(java.io.FileDescriptor); - method @dalvik.annotation.compat.UnsupportedAppUsage public static void closeQuietly(java.net.Socket); + method public static void closeQuietly(AutoCloseable); + method public static void closeQuietly(java.io.FileDescriptor); + method public static void closeQuietly(java.net.Socket); method @Deprecated public static void deleteContents(java.io.File) throws java.io.IOException; - method @dalvik.annotation.compat.UnsupportedAppUsage public static byte[] readFileAsByteArray(String) throws java.io.IOException; - method @dalvik.annotation.compat.UnsupportedAppUsage public static String readFileAsString(String) throws java.io.IOException; - method @dalvik.annotation.compat.UnsupportedAppUsage public static void setBlocking(java.io.FileDescriptor, boolean) throws java.io.IOException; + method public static byte[] readFileAsByteArray(String) throws java.io.IOException; + method public static String readFileAsString(String) throws java.io.IOException; + method public static void setBlocking(java.io.FileDescriptor, boolean) throws java.io.IOException; method public static void setFdOwner(@NonNull java.io.FileDescriptor, @NonNull Object); } @@ -1053,14 +1053,14 @@ package libcore.io { } public final class Streams { - method @dalvik.annotation.compat.UnsupportedAppUsage public static int copy(java.io.InputStream, java.io.OutputStream) throws java.io.IOException; - method @dalvik.annotation.compat.UnsupportedAppUsage public static void readFully(java.io.InputStream, byte[]) throws java.io.IOException; - method @dalvik.annotation.compat.UnsupportedAppUsage public static byte[] readFully(java.io.InputStream) throws java.io.IOException; + method public static int copy(java.io.InputStream, java.io.OutputStream) throws java.io.IOException; + method public static void readFully(java.io.InputStream, byte[]) throws java.io.IOException; + method public static byte[] readFully(java.io.InputStream) throws java.io.IOException; method public static String readFully(java.io.Reader) throws java.io.IOException; method public static byte[] readFullyNoClose(java.io.InputStream) throws java.io.IOException; - method @dalvik.annotation.compat.UnsupportedAppUsage public static int readSingleByte(java.io.InputStream) throws java.io.IOException; + method public static int readSingleByte(java.io.InputStream) throws java.io.IOException; method public static long skipByReading(java.io.InputStream, long) throws java.io.IOException; - method @dalvik.annotation.compat.UnsupportedAppUsage public static void writeSingleByte(java.io.OutputStream, int) throws java.io.IOException; + method public static void writeSingleByte(java.io.OutputStream, int) throws java.io.IOException; } } @@ -1076,7 +1076,7 @@ package libcore.net { ctor public NetworkSecurityPolicy(); method public static libcore.net.NetworkSecurityPolicy getInstance(); method public abstract boolean isCertificateTransparencyVerificationRequired(String); - method @dalvik.annotation.compat.UnsupportedAppUsage public abstract boolean isCleartextTrafficPermitted(); + method public abstract boolean isCleartextTrafficPermitted(); method public abstract boolean isCleartextTrafficPermitted(String); method public static void setInstance(libcore.net.NetworkSecurityPolicy); } @@ -1086,7 +1086,7 @@ package libcore.net { package libcore.net.event { public class NetworkEventDispatcher { - method @dalvik.annotation.compat.UnsupportedAppUsage public static libcore.net.event.NetworkEventDispatcher getInstance(); + method public static libcore.net.event.NetworkEventDispatcher getInstance(); method public void onNetworkConfigurationChanged(); } @@ -1212,11 +1212,11 @@ package libcore.util { public final class EmptyArray { field public static final boolean[] BOOLEAN; - field @dalvik.annotation.compat.UnsupportedAppUsage(maxTargetSdk=dalvik.annotation.compat.VersionCodes.Q, publicAlternatives="Use {@code new byte[0]} instead.") public static final byte[] BYTE; + field public static final byte[] BYTE; field public static final float[] FLOAT; - field @dalvik.annotation.compat.UnsupportedAppUsage(maxTargetSdk=dalvik.annotation.compat.VersionCodes.Q, publicAlternatives="Use {@code new int[0]} instead.") public static final int[] INT; - field @dalvik.annotation.compat.UnsupportedAppUsage(maxTargetSdk=dalvik.annotation.compat.VersionCodes.Q, publicAlternatives="Use {@code new long[0]} instead.") public static final long[] LONG; - field @dalvik.annotation.compat.UnsupportedAppUsage(maxTargetSdk=dalvik.annotation.compat.VersionCodes.Q, publicAlternatives="Use {@code new Object[0]} instead.") public static final Object[] OBJECT; + field public static final int[] INT; + field public static final long[] LONG; + field public static final Object[] OBJECT; field public static final String[] STRING; } @@ -1354,7 +1354,7 @@ package org.apache.harmony.dalvik.ddmc { public class Chunk { ctor public Chunk(int, byte[], int, int); - ctor @dalvik.annotation.compat.UnsupportedAppUsage public Chunk(int, java.nio.ByteBuffer); + ctor public Chunk(int, java.nio.ByteBuffer); field public int type; } @@ -1369,21 +1369,21 @@ package org.apache.harmony.dalvik.ddmc { method public static void putString(java.nio.ByteBuffer, String); method public static int type(String); method public static java.nio.ByteBuffer wrapChunk(org.apache.harmony.dalvik.ddmc.Chunk); - field @dalvik.annotation.compat.UnsupportedAppUsage public static final java.nio.ByteOrder CHUNK_ORDER; + field public static final java.nio.ByteOrder CHUNK_ORDER; } public class DdmServer { method public static void registerHandler(int, org.apache.harmony.dalvik.ddmc.ChunkHandler); method public static void registrationComplete(); - method @dalvik.annotation.compat.UnsupportedAppUsage public static void sendChunk(org.apache.harmony.dalvik.ddmc.Chunk); + method public static void sendChunk(org.apache.harmony.dalvik.ddmc.Chunk); } public class DdmVmInternal { method public static void enableRecentAllocations(boolean); method @dalvik.annotation.optimization.FastNative public static boolean getRecentAllocationStatus(); method @dalvik.annotation.optimization.FastNative public static byte[] getRecentAllocations(); - method @dalvik.annotation.compat.UnsupportedAppUsage public static StackTraceElement[] getStackTraceById(int); - method @dalvik.annotation.compat.UnsupportedAppUsage public static byte[] getThreadStats(); + method public static StackTraceElement[] getStackTraceById(int); + method public static byte[] getThreadStats(); method @dalvik.annotation.optimization.FastNative public static boolean heapInfoNotify(int); method public static boolean heapSegmentNotify(int, int, boolean); method public static void threadNotify(boolean); @@ -1394,7 +1394,7 @@ package org.apache.harmony.dalvik.ddmc { package org.json { public class JSONObject { - method @dalvik.annotation.compat.UnsupportedAppUsage public java.util.Set<java.lang.String> keySet(); + method public java.util.Set<java.lang.String> keySet(); } } diff --git a/mmodules/intracoreapi/api/intra/current-api.txt b/mmodules/intracoreapi/api/intra/current-api.txt index 01572c43ee..df28b0255b 100644 --- a/mmodules/intracoreapi/api/intra/current-api.txt +++ b/mmodules/intracoreapi/api/intra/current-api.txt @@ -52,18 +52,18 @@ package dalvik.annotation.optimization { package dalvik.system { @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public final class BlockGuard { - method @NonNull @dalvik.annotation.compat.UnsupportedAppUsage @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public static dalvik.system.BlockGuard.Policy getThreadPolicy(); + method @NonNull @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public static dalvik.system.BlockGuard.Policy getThreadPolicy(); } @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public static interface BlockGuard.Policy { - method @dalvik.annotation.compat.UnsupportedAppUsage @libcore.api.IntraCoreApi public void onNetwork(); + method @libcore.api.IntraCoreApi public void onNetwork(); } @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public final class CloseGuard { - method @dalvik.annotation.compat.UnsupportedAppUsage @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public void close(); - method @dalvik.annotation.compat.UnsupportedAppUsage(trackingBug=111170242) @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public static dalvik.system.CloseGuard get(); - method @dalvik.annotation.compat.UnsupportedAppUsage(trackingBug=111170242) @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public void open(String); - method @dalvik.annotation.compat.UnsupportedAppUsage(trackingBug=111170242) @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public void warnIfOpen(); + method @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public void close(); + method @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public static dalvik.system.CloseGuard get(); + method @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public void open(String); + method @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public void warnIfOpen(); } } diff --git a/ojluni/annotations/hiddenapi/com/sun/nio/file/ExtendedWatchEventModifier.java b/ojluni/annotations/hiddenapi/com/sun/nio/file/ExtendedWatchEventModifier.java index d3d1fd7a4c..9abd97c8d8 100644 --- a/ojluni/annotations/hiddenapi/com/sun/nio/file/ExtendedWatchEventModifier.java +++ b/ojluni/annotations/hiddenapi/com/sun/nio/file/ExtendedWatchEventModifier.java @@ -27,7 +27,7 @@ package com.sun.nio.file; @SuppressWarnings({"unchecked", "deprecation", "all"}) public enum ExtendedWatchEventModifier implements java.nio.file.WatchEvent.Modifier { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage FILE_TREE; private ExtendedWatchEventModifier() { diff --git a/ojluni/annotations/hiddenapi/java/io/Console.java b/ojluni/annotations/hiddenapi/java/io/Console.java index 9a93310b78..24039a1e1b 100644 --- a/ojluni/annotations/hiddenapi/java/io/Console.java +++ b/ojluni/annotations/hiddenapi/java/io/Console.java @@ -26,7 +26,7 @@ package java.io; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class Console implements java.io.Flushable { diff --git a/ojluni/annotations/hiddenapi/java/io/File.java b/ojluni/annotations/hiddenapi/java/io/File.java index 7b93218cad..bdcce885bd 100644 --- a/ojluni/annotations/hiddenapi/java/io/File.java +++ b/ojluni/annotations/hiddenapi/java/io/File.java @@ -26,7 +26,7 @@ package java.io; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class File implements java.io.Serializable, java.lang.Comparable<java.io.File> { diff --git a/ojluni/annotations/hiddenapi/java/io/FileDescriptor.java b/ojluni/annotations/hiddenapi/java/io/FileDescriptor.java index 7872403862..6e9e74d4c4 100644 --- a/ojluni/annotations/hiddenapi/java/io/FileDescriptor.java +++ b/ojluni/annotations/hiddenapi/java/io/FileDescriptor.java @@ -25,7 +25,7 @@ package java.io; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class FileDescriptor { diff --git a/ojluni/annotations/hiddenapi/java/io/FileInputStream.java b/ojluni/annotations/hiddenapi/java/io/FileInputStream.java index 3de1617018..1999d13128 100644 --- a/ojluni/annotations/hiddenapi/java/io/FileInputStream.java +++ b/ojluni/annotations/hiddenapi/java/io/FileInputStream.java @@ -26,7 +26,7 @@ package java.io; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class FileInputStream extends java.io.InputStream { diff --git a/ojluni/annotations/hiddenapi/java/io/FileOutputStream.java b/ojluni/annotations/hiddenapi/java/io/FileOutputStream.java index b918f6ac3a..5e35fc09ed 100644 --- a/ojluni/annotations/hiddenapi/java/io/FileOutputStream.java +++ b/ojluni/annotations/hiddenapi/java/io/FileOutputStream.java @@ -26,7 +26,7 @@ package java.io; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class FileOutputStream extends java.io.OutputStream { diff --git a/ojluni/annotations/hiddenapi/java/io/FileSystem.java b/ojluni/annotations/hiddenapi/java/io/FileSystem.java index 4999b3c64b..e522846cd3 100644 --- a/ojluni/annotations/hiddenapi/java/io/FileSystem.java +++ b/ojluni/annotations/hiddenapi/java/io/FileSystem.java @@ -26,7 +26,7 @@ package java.io; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) abstract class FileSystem { 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 diff --git a/ojluni/annotations/hiddenapi/java/io/ObjectOutputStream.java b/ojluni/annotations/hiddenapi/java/io/ObjectOutputStream.java index f3e462d671..1e429a43e4 100644 --- a/ojluni/annotations/hiddenapi/java/io/ObjectOutputStream.java +++ b/ojluni/annotations/hiddenapi/java/io/ObjectOutputStream.java @@ -26,7 +26,7 @@ package java.io; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ObjectOutputStream extends java.io.OutputStream diff --git a/ojluni/annotations/hiddenapi/java/io/ObjectStreamClass.java b/ojluni/annotations/hiddenapi/java/io/ObjectStreamClass.java index d617d32934..658d60178f 100644 --- a/ojluni/annotations/hiddenapi/java/io/ObjectStreamClass.java +++ b/ojluni/annotations/hiddenapi/java/io/ObjectStreamClass.java @@ -25,7 +25,7 @@ package java.io; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ObjectStreamClass implements java.io.Serializable { diff --git a/ojluni/annotations/hiddenapi/java/io/ObjectStreamField.java b/ojluni/annotations/hiddenapi/java/io/ObjectStreamField.java index b3b7c34691..36ba79917e 100644 --- a/ojluni/annotations/hiddenapi/java/io/ObjectStreamField.java +++ b/ojluni/annotations/hiddenapi/java/io/ObjectStreamField.java @@ -25,7 +25,7 @@ package java.io; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ObjectStreamField implements java.lang.Comparable<java.lang.Object> { diff --git a/ojluni/annotations/hiddenapi/java/io/RandomAccessFile.java b/ojluni/annotations/hiddenapi/java/io/RandomAccessFile.java index 32d36ab1ca..5bc7d69e2b 100644 --- a/ojluni/annotations/hiddenapi/java/io/RandomAccessFile.java +++ b/ojluni/annotations/hiddenapi/java/io/RandomAccessFile.java @@ -26,7 +26,7 @@ package java.io; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class RandomAccessFile implements java.io.DataOutput, java.io.DataInput, java.io.Closeable { diff --git a/ojluni/annotations/hiddenapi/java/lang/AbstractStringBuilder.java b/ojluni/annotations/hiddenapi/java/lang/AbstractStringBuilder.java index 42a5b552f9..4ec2383068 100644 --- a/ojluni/annotations/hiddenapi/java/lang/AbstractStringBuilder.java +++ b/ojluni/annotations/hiddenapi/java/lang/AbstractStringBuilder.java @@ -25,7 +25,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) abstract class AbstractStringBuilder implements java.lang.Appendable, java.lang.CharSequence { diff --git a/ojluni/annotations/hiddenapi/java/lang/Boolean.java b/ojluni/annotations/hiddenapi/java/lang/Boolean.java index d5b749c5fb..5f82352e3e 100644 --- a/ojluni/annotations/hiddenapi/java/lang/Boolean.java +++ b/ojluni/annotations/hiddenapi/java/lang/Boolean.java @@ -25,7 +25,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.compat.VersionCodes; @SuppressWarnings({"unchecked", "deprecation", "all"}) diff --git a/ojluni/annotations/hiddenapi/java/lang/Byte.java b/ojluni/annotations/hiddenapi/java/lang/Byte.java index 4e58f2b4b4..612108b2d0 100644 --- a/ojluni/annotations/hiddenapi/java/lang/Byte.java +++ b/ojluni/annotations/hiddenapi/java/lang/Byte.java @@ -25,7 +25,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.compat.VersionCodes; @SuppressWarnings({"unchecked", "deprecation", "all"}) diff --git a/ojluni/annotations/hiddenapi/java/lang/Character.java b/ojluni/annotations/hiddenapi/java/lang/Character.java index d6c68e35e5..207008e611 100644 --- a/ojluni/annotations/hiddenapi/java/lang/Character.java +++ b/ojluni/annotations/hiddenapi/java/lang/Character.java @@ -25,7 +25,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.compat.VersionCodes; @SuppressWarnings({"unchecked", "deprecation", "all"}) diff --git a/ojluni/annotations/hiddenapi/java/lang/Class.java b/ojluni/annotations/hiddenapi/java/lang/Class.java index 12a69d7eb8..a9c15152b3 100644 --- a/ojluni/annotations/hiddenapi/java/lang/Class.java +++ b/ojluni/annotations/hiddenapi/java/lang/Class.java @@ -26,7 +26,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class Class<T> diff --git a/ojluni/annotations/hiddenapi/java/lang/ClassLoader.java b/ojluni/annotations/hiddenapi/java/lang/ClassLoader.java index 6af0cb8223..b9c371ea7e 100644 --- a/ojluni/annotations/hiddenapi/java/lang/ClassLoader.java +++ b/ojluni/annotations/hiddenapi/java/lang/ClassLoader.java @@ -26,7 +26,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class ClassLoader { diff --git a/ojluni/annotations/hiddenapi/java/lang/Double.java b/ojluni/annotations/hiddenapi/java/lang/Double.java index d58289f097..1daeeb97ea 100644 --- a/ojluni/annotations/hiddenapi/java/lang/Double.java +++ b/ojluni/annotations/hiddenapi/java/lang/Double.java @@ -25,7 +25,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.compat.VersionCodes; @SuppressWarnings({"unchecked", "deprecation", "all"}) diff --git a/ojluni/annotations/hiddenapi/java/lang/Enum.java b/ojluni/annotations/hiddenapi/java/lang/Enum.java index 369e58e037..8cd1b6dc5b 100644 --- a/ojluni/annotations/hiddenapi/java/lang/Enum.java +++ b/ojluni/annotations/hiddenapi/java/lang/Enum.java @@ -26,7 +26,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class Enum<E extends java.lang.Enum<E>> diff --git a/ojluni/annotations/hiddenapi/java/lang/Float.java b/ojluni/annotations/hiddenapi/java/lang/Float.java index da45b52f70..98f0b093ea 100644 --- a/ojluni/annotations/hiddenapi/java/lang/Float.java +++ b/ojluni/annotations/hiddenapi/java/lang/Float.java @@ -25,7 +25,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.compat.VersionCodes; @SuppressWarnings({"unchecked", "deprecation", "all"}) diff --git a/ojluni/annotations/hiddenapi/java/lang/Integer.java b/ojluni/annotations/hiddenapi/java/lang/Integer.java index 49bec248d1..388878e18e 100644 --- a/ojluni/annotations/hiddenapi/java/lang/Integer.java +++ b/ojluni/annotations/hiddenapi/java/lang/Integer.java @@ -26,7 +26,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.compat.VersionCodes; @SuppressWarnings({"unchecked", "deprecation", "all"}) diff --git a/ojluni/annotations/hiddenapi/java/lang/Long.java b/ojluni/annotations/hiddenapi/java/lang/Long.java index a8ae8693b4..e3041cc6ce 100644 --- a/ojluni/annotations/hiddenapi/java/lang/Long.java +++ b/ojluni/annotations/hiddenapi/java/lang/Long.java @@ -26,7 +26,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.compat.VersionCodes; @SuppressWarnings({"unchecked", "deprecation", "all"}) diff --git a/ojluni/annotations/hiddenapi/java/lang/Object.java b/ojluni/annotations/hiddenapi/java/lang/Object.java index 5289874686..7b26bf5e66 100644 --- a/ojluni/annotations/hiddenapi/java/lang/Object.java +++ b/ojluni/annotations/hiddenapi/java/lang/Object.java @@ -26,7 +26,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Object { diff --git a/ojluni/annotations/hiddenapi/java/lang/Runtime.java b/ojluni/annotations/hiddenapi/java/lang/Runtime.java index ca8c56c34d..798967fc73 100644 --- a/ojluni/annotations/hiddenapi/java/lang/Runtime.java +++ b/ojluni/annotations/hiddenapi/java/lang/Runtime.java @@ -26,7 +26,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Runtime { diff --git a/ojluni/annotations/hiddenapi/java/lang/Short.java b/ojluni/annotations/hiddenapi/java/lang/Short.java index 00583c9a79..05f18cece5 100644 --- a/ojluni/annotations/hiddenapi/java/lang/Short.java +++ b/ojluni/annotations/hiddenapi/java/lang/Short.java @@ -25,7 +25,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.compat.VersionCodes; @SuppressWarnings({"unchecked", "deprecation", "all"}) diff --git a/ojluni/annotations/hiddenapi/java/lang/StackTraceElement.java b/ojluni/annotations/hiddenapi/java/lang/StackTraceElement.java index a396013ddf..010d949dae 100644 --- a/ojluni/annotations/hiddenapi/java/lang/StackTraceElement.java +++ b/ojluni/annotations/hiddenapi/java/lang/StackTraceElement.java @@ -25,7 +25,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class StackTraceElement implements java.io.Serializable { diff --git a/ojluni/annotations/hiddenapi/java/lang/String.java b/ojluni/annotations/hiddenapi/java/lang/String.java index 51fdfb7add..a7b137a519 100644 --- a/ojluni/annotations/hiddenapi/java/lang/String.java +++ b/ojluni/annotations/hiddenapi/java/lang/String.java @@ -26,7 +26,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class String diff --git a/ojluni/annotations/hiddenapi/java/lang/System.java b/ojluni/annotations/hiddenapi/java/lang/System.java index a401efdbca..407473b1d2 100644 --- a/ojluni/annotations/hiddenapi/java/lang/System.java +++ b/ojluni/annotations/hiddenapi/java/lang/System.java @@ -26,7 +26,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class System { diff --git a/ojluni/annotations/hiddenapi/java/lang/Thread.java b/ojluni/annotations/hiddenapi/java/lang/Thread.java index f1b314dac7..36ca327997 100644 --- a/ojluni/annotations/hiddenapi/java/lang/Thread.java +++ b/ojluni/annotations/hiddenapi/java/lang/Thread.java @@ -26,7 +26,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Thread implements java.lang.Runnable { diff --git a/ojluni/annotations/hiddenapi/java/lang/ThreadGroup.java b/ojluni/annotations/hiddenapi/java/lang/ThreadGroup.java index ee9feb0e58..bc6903318d 100644 --- a/ojluni/annotations/hiddenapi/java/lang/ThreadGroup.java +++ b/ojluni/annotations/hiddenapi/java/lang/ThreadGroup.java @@ -26,7 +26,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ThreadGroup implements java.lang.Thread.UncaughtExceptionHandler { diff --git a/ojluni/annotations/hiddenapi/java/lang/ThreadLocal.java b/ojluni/annotations/hiddenapi/java/lang/ThreadLocal.java index 5772a6d5ac..ca5927b706 100644 --- a/ojluni/annotations/hiddenapi/java/lang/ThreadLocal.java +++ b/ojluni/annotations/hiddenapi/java/lang/ThreadLocal.java @@ -25,7 +25,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ThreadLocal<T> { diff --git a/ojluni/annotations/hiddenapi/java/lang/Throwable.java b/ojluni/annotations/hiddenapi/java/lang/Throwable.java index 0bc7d12cf1..00a3b2c168 100644 --- a/ojluni/annotations/hiddenapi/java/lang/Throwable.java +++ b/ojluni/annotations/hiddenapi/java/lang/Throwable.java @@ -26,7 +26,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Throwable implements java.io.Serializable { diff --git a/ojluni/annotations/hiddenapi/java/lang/UNIXProcess.java b/ojluni/annotations/hiddenapi/java/lang/UNIXProcess.java index 75c3aa88e8..974ca3ebfa 100644 --- a/ojluni/annotations/hiddenapi/java/lang/UNIXProcess.java +++ b/ojluni/annotations/hiddenapi/java/lang/UNIXProcess.java @@ -104,7 +104,7 @@ final class UNIXProcess extends java.lang.Process { private boolean hasExited; - @dalvik.annotation.compat.UnsupportedAppUsage private final int pid; + @android.compat.annotation.UnsupportedAppUsage private final int pid; { pid = 0; diff --git a/ojluni/annotations/hiddenapi/java/lang/Void.java b/ojluni/annotations/hiddenapi/java/lang/Void.java index e082300ffe..35118c44b4 100644 --- a/ojluni/annotations/hiddenapi/java/lang/Void.java +++ b/ojluni/annotations/hiddenapi/java/lang/Void.java @@ -25,7 +25,7 @@ package java.lang; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class Void { diff --git a/ojluni/annotations/hiddenapi/java/lang/invoke/MethodHandles.java b/ojluni/annotations/hiddenapi/java/lang/invoke/MethodHandles.java index dcb5f1154b..d89c2a1443 100644 --- a/ojluni/annotations/hiddenapi/java/lang/invoke/MethodHandles.java +++ b/ojluni/annotations/hiddenapi/java/lang/invoke/MethodHandles.java @@ -25,7 +25,7 @@ package java.lang.invoke; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class MethodHandles { diff --git a/ojluni/annotations/hiddenapi/java/lang/invoke/SerializedLambda.java b/ojluni/annotations/hiddenapi/java/lang/invoke/SerializedLambda.java index b63d0def63..fd92ce4279 100644 --- a/ojluni/annotations/hiddenapi/java/lang/invoke/SerializedLambda.java +++ b/ojluni/annotations/hiddenapi/java/lang/invoke/SerializedLambda.java @@ -24,7 +24,7 @@ */ package java.lang.invoke; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import java.io.Serializable; public final class SerializedLambda implements Serializable { diff --git a/ojluni/annotations/hiddenapi/java/lang/ref/Reference.java b/ojluni/annotations/hiddenapi/java/lang/ref/Reference.java index f2239ea5a8..74359c1555 100644 --- a/ojluni/annotations/hiddenapi/java/lang/ref/Reference.java +++ b/ojluni/annotations/hiddenapi/java/lang/ref/Reference.java @@ -26,7 +26,7 @@ package java.lang.ref; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class Reference<T> { diff --git a/ojluni/annotations/hiddenapi/java/lang/ref/ReferenceQueue.java b/ojluni/annotations/hiddenapi/java/lang/ref/ReferenceQueue.java index 423b8307ad..e123068758 100644 --- a/ojluni/annotations/hiddenapi/java/lang/ref/ReferenceQueue.java +++ b/ojluni/annotations/hiddenapi/java/lang/ref/ReferenceQueue.java @@ -26,7 +26,7 @@ package java.lang.ref; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ReferenceQueue<T> { diff --git a/ojluni/annotations/hiddenapi/java/lang/reflect/AccessibleObject.java b/ojluni/annotations/hiddenapi/java/lang/reflect/AccessibleObject.java index b105a24b90..0a7060852b 100644 --- a/ojluni/annotations/hiddenapi/java/lang/reflect/AccessibleObject.java +++ b/ojluni/annotations/hiddenapi/java/lang/reflect/AccessibleObject.java @@ -26,7 +26,7 @@ package java.lang.reflect; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class AccessibleObject implements java.lang.reflect.AnnotatedElement { diff --git a/ojluni/annotations/hiddenapi/java/lang/reflect/Constructor.java b/ojluni/annotations/hiddenapi/java/lang/reflect/Constructor.java index 79d24e3ce8..5accc6a366 100644 --- a/ojluni/annotations/hiddenapi/java/lang/reflect/Constructor.java +++ b/ojluni/annotations/hiddenapi/java/lang/reflect/Constructor.java @@ -26,7 +26,7 @@ package java.lang.reflect; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class Constructor<T> extends java.lang.reflect.Executable { diff --git a/ojluni/annotations/hiddenapi/java/lang/reflect/Executable.java b/ojluni/annotations/hiddenapi/java/lang/reflect/Executable.java index e40b1b1a9a..198e79f276 100644 --- a/ojluni/annotations/hiddenapi/java/lang/reflect/Executable.java +++ b/ojluni/annotations/hiddenapi/java/lang/reflect/Executable.java @@ -25,7 +25,7 @@ package java.lang.reflect; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class Executable extends java.lang.reflect.AccessibleObject diff --git a/ojluni/annotations/hiddenapi/java/lang/reflect/Field.java b/ojluni/annotations/hiddenapi/java/lang/reflect/Field.java index 2048f74d03..7e9b0b42ff 100644 --- a/ojluni/annotations/hiddenapi/java/lang/reflect/Field.java +++ b/ojluni/annotations/hiddenapi/java/lang/reflect/Field.java @@ -26,7 +26,7 @@ package java.lang.reflect; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class Field extends java.lang.reflect.AccessibleObject diff --git a/ojluni/annotations/hiddenapi/java/lang/reflect/Parameter.java b/ojluni/annotations/hiddenapi/java/lang/reflect/Parameter.java index 40ccf9e066..9982658775 100644 --- a/ojluni/annotations/hiddenapi/java/lang/reflect/Parameter.java +++ b/ojluni/annotations/hiddenapi/java/lang/reflect/Parameter.java @@ -25,7 +25,7 @@ package java.lang.reflect; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class Parameter implements java.lang.reflect.AnnotatedElement { diff --git a/ojluni/annotations/hiddenapi/java/lang/reflect/Proxy.java b/ojluni/annotations/hiddenapi/java/lang/reflect/Proxy.java index e65bf19f19..593de12cb0 100644 --- a/ojluni/annotations/hiddenapi/java/lang/reflect/Proxy.java +++ b/ojluni/annotations/hiddenapi/java/lang/reflect/Proxy.java @@ -26,7 +26,7 @@ package java.lang.reflect; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Proxy implements java.io.Serializable { diff --git a/ojluni/annotations/hiddenapi/java/net/Authenticator.java b/ojluni/annotations/hiddenapi/java/net/Authenticator.java index 2765044ed7..3ac00897a8 100644 --- a/ojluni/annotations/hiddenapi/java/net/Authenticator.java +++ b/ojluni/annotations/hiddenapi/java/net/Authenticator.java @@ -25,7 +25,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class Authenticator { diff --git a/ojluni/annotations/hiddenapi/java/net/DatagramSocket.java b/ojluni/annotations/hiddenapi/java/net/DatagramSocket.java index fd804c78bb..db3446a05f 100644 --- a/ojluni/annotations/hiddenapi/java/net/DatagramSocket.java +++ b/ojluni/annotations/hiddenapi/java/net/DatagramSocket.java @@ -26,7 +26,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class DatagramSocket implements java.io.Closeable { diff --git a/ojluni/annotations/hiddenapi/java/net/HttpCookie.java b/ojluni/annotations/hiddenapi/java/net/HttpCookie.java index 938f59ee1c..97189e49c3 100644 --- a/ojluni/annotations/hiddenapi/java/net/HttpCookie.java +++ b/ojluni/annotations/hiddenapi/java/net/HttpCookie.java @@ -26,7 +26,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class HttpCookie implements java.lang.Cloneable { diff --git a/ojluni/annotations/hiddenapi/java/net/Inet4Address.java b/ojluni/annotations/hiddenapi/java/net/Inet4Address.java index 16395eae7c..b8f60cbf09 100644 --- a/ojluni/annotations/hiddenapi/java/net/Inet4Address.java +++ b/ojluni/annotations/hiddenapi/java/net/Inet4Address.java @@ -26,7 +26,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class Inet4Address extends java.net.InetAddress { diff --git a/ojluni/annotations/hiddenapi/java/net/Inet6Address.java b/ojluni/annotations/hiddenapi/java/net/Inet6Address.java index f46fa58533..fc48ebc3fd 100644 --- a/ojluni/annotations/hiddenapi/java/net/Inet6Address.java +++ b/ojluni/annotations/hiddenapi/java/net/Inet6Address.java @@ -26,7 +26,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class Inet6Address extends java.net.InetAddress { diff --git a/ojluni/annotations/hiddenapi/java/net/Inet6AddressImpl.java b/ojluni/annotations/hiddenapi/java/net/Inet6AddressImpl.java index 964bdda062..dd25edf872 100644 --- a/ojluni/annotations/hiddenapi/java/net/Inet6AddressImpl.java +++ b/ojluni/annotations/hiddenapi/java/net/Inet6AddressImpl.java @@ -81,7 +81,7 @@ class Inet6AddressImpl implements java.net.InetAddressImpl { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private static final java.net.AddressCache addressCache; static { diff --git a/ojluni/annotations/hiddenapi/java/net/InetAddress.java b/ojluni/annotations/hiddenapi/java/net/InetAddress.java index 6436a6bf39..2be05b798f 100644 --- a/ojluni/annotations/hiddenapi/java/net/InetAddress.java +++ b/ojluni/annotations/hiddenapi/java/net/InetAddress.java @@ -26,7 +26,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.compat.VersionCodes; @SuppressWarnings({"unchecked", "deprecation", "all"}) diff --git a/ojluni/annotations/hiddenapi/java/net/InetSocketAddress.java b/ojluni/annotations/hiddenapi/java/net/InetSocketAddress.java index 0a54f95eec..7522e0ee61 100644 --- a/ojluni/annotations/hiddenapi/java/net/InetSocketAddress.java +++ b/ojluni/annotations/hiddenapi/java/net/InetSocketAddress.java @@ -26,7 +26,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class InetSocketAddress extends java.net.SocketAddress { diff --git a/ojluni/annotations/hiddenapi/java/net/InterfaceAddress.java b/ojluni/annotations/hiddenapi/java/net/InterfaceAddress.java index 728784767a..84d3537b64 100644 --- a/ojluni/annotations/hiddenapi/java/net/InterfaceAddress.java +++ b/ojluni/annotations/hiddenapi/java/net/InterfaceAddress.java @@ -25,7 +25,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class InterfaceAddress { diff --git a/ojluni/annotations/hiddenapi/java/net/PlainSocketImpl.java b/ojluni/annotations/hiddenapi/java/net/PlainSocketImpl.java index 806a428262..4d7b6be552 100644 --- a/ojluni/annotations/hiddenapi/java/net/PlainSocketImpl.java +++ b/ojluni/annotations/hiddenapi/java/net/PlainSocketImpl.java @@ -29,7 +29,7 @@ package java.net; @SuppressWarnings({"unchecked", "deprecation", "all"}) class PlainSocketImpl extends java.net.AbstractPlainSocketImpl { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage PlainSocketImpl() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/java/net/Proxy.java b/ojluni/annotations/hiddenapi/java/net/Proxy.java index 4df3fa48c2..ff91f355ac 100644 --- a/ojluni/annotations/hiddenapi/java/net/Proxy.java +++ b/ojluni/annotations/hiddenapi/java/net/Proxy.java @@ -25,7 +25,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Proxy { diff --git a/ojluni/annotations/hiddenapi/java/net/ServerSocket.java b/ojluni/annotations/hiddenapi/java/net/ServerSocket.java index eabb24772f..ad0788ab8c 100644 --- a/ojluni/annotations/hiddenapi/java/net/ServerSocket.java +++ b/ojluni/annotations/hiddenapi/java/net/ServerSocket.java @@ -25,7 +25,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ServerSocket implements java.io.Closeable { diff --git a/ojluni/annotations/hiddenapi/java/net/Socket.java b/ojluni/annotations/hiddenapi/java/net/Socket.java index 2ad18ff46f..495d134cf4 100644 --- a/ojluni/annotations/hiddenapi/java/net/Socket.java +++ b/ojluni/annotations/hiddenapi/java/net/Socket.java @@ -26,7 +26,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Socket implements java.io.Closeable { diff --git a/ojluni/annotations/hiddenapi/java/net/SocketException.java b/ojluni/annotations/hiddenapi/java/net/SocketException.java index 03e48e9ea3..3775798bcd 100644 --- a/ojluni/annotations/hiddenapi/java/net/SocketException.java +++ b/ojluni/annotations/hiddenapi/java/net/SocketException.java @@ -26,7 +26,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class SocketException extends java.io.IOException { diff --git a/ojluni/annotations/hiddenapi/java/net/SocketImpl.java b/ojluni/annotations/hiddenapi/java/net/SocketImpl.java index be5c4f8b1c..9b9461adad 100644 --- a/ojluni/annotations/hiddenapi/java/net/SocketImpl.java +++ b/ojluni/annotations/hiddenapi/java/net/SocketImpl.java @@ -26,7 +26,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class SocketImpl implements java.net.SocketOptions { diff --git a/ojluni/annotations/hiddenapi/java/net/SocksSocketImpl.java b/ojluni/annotations/hiddenapi/java/net/SocksSocketImpl.java index 6e0f66cbd7..001d4414f1 100644 --- a/ojluni/annotations/hiddenapi/java/net/SocksSocketImpl.java +++ b/ojluni/annotations/hiddenapi/java/net/SocksSocketImpl.java @@ -25,7 +25,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) class SocksSocketImpl extends java.net.PlainSocketImpl implements java.net.SocksConsts { diff --git a/ojluni/annotations/hiddenapi/java/net/URI.java b/ojluni/annotations/hiddenapi/java/net/URI.java index 2287ab8da6..ec7e242dc0 100644 --- a/ojluni/annotations/hiddenapi/java/net/URI.java +++ b/ojluni/annotations/hiddenapi/java/net/URI.java @@ -26,7 +26,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class URI implements java.lang.Comparable<java.net.URI>, java.io.Serializable { diff --git a/ojluni/annotations/hiddenapi/java/net/URL.java b/ojluni/annotations/hiddenapi/java/net/URL.java index 905413ca69..9ba63581fd 100644 --- a/ojluni/annotations/hiddenapi/java/net/URL.java +++ b/ojluni/annotations/hiddenapi/java/net/URL.java @@ -26,7 +26,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class URL implements java.io.Serializable { diff --git a/ojluni/annotations/hiddenapi/java/net/URLClassLoader.java b/ojluni/annotations/hiddenapi/java/net/URLClassLoader.java index 105b0c7f0a..c9a040db67 100644 --- a/ojluni/annotations/hiddenapi/java/net/URLClassLoader.java +++ b/ojluni/annotations/hiddenapi/java/net/URLClassLoader.java @@ -25,7 +25,7 @@ package java.net; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class URLClassLoader extends java.security.SecureClassLoader implements java.io.Closeable { diff --git a/ojluni/annotations/hiddenapi/java/nio/Buffer.java b/ojluni/annotations/hiddenapi/java/nio/Buffer.java index cbcd8c1850..fa8b31b868 100644 --- a/ojluni/annotations/hiddenapi/java/nio/Buffer.java +++ b/ojluni/annotations/hiddenapi/java/nio/Buffer.java @@ -26,7 +26,7 @@ package java.nio; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class Buffer { diff --git a/ojluni/annotations/hiddenapi/java/nio/ByteBuffer.java b/ojluni/annotations/hiddenapi/java/nio/ByteBuffer.java index 65b6d58e4e..32f53a4789 100644 --- a/ojluni/annotations/hiddenapi/java/nio/ByteBuffer.java +++ b/ojluni/annotations/hiddenapi/java/nio/ByteBuffer.java @@ -28,7 +28,7 @@ package java.nio; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class ByteBuffer extends java.nio.Buffer diff --git a/ojluni/annotations/hiddenapi/java/nio/CharBuffer.java b/ojluni/annotations/hiddenapi/java/nio/CharBuffer.java index 891e8c309c..b447bb698e 100644 --- a/ojluni/annotations/hiddenapi/java/nio/CharBuffer.java +++ b/ojluni/annotations/hiddenapi/java/nio/CharBuffer.java @@ -28,7 +28,7 @@ package java.nio; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class CharBuffer extends java.nio.Buffer diff --git a/ojluni/annotations/hiddenapi/java/nio/DirectByteBuffer.java b/ojluni/annotations/hiddenapi/java/nio/DirectByteBuffer.java index 1d5e04f9b5..b6ca5fb8ff 100644 --- a/ojluni/annotations/hiddenapi/java/nio/DirectByteBuffer.java +++ b/ojluni/annotations/hiddenapi/java/nio/DirectByteBuffer.java @@ -26,7 +26,7 @@ package java.nio; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class DirectByteBuffer extends java.nio.MappedByteBuffer implements sun.nio.ch.DirectBuffer { diff --git a/ojluni/annotations/hiddenapi/java/nio/charset/Charset.java b/ojluni/annotations/hiddenapi/java/nio/charset/Charset.java index daaa265533..fb86662bbd 100644 --- a/ojluni/annotations/hiddenapi/java/nio/charset/Charset.java +++ b/ojluni/annotations/hiddenapi/java/nio/charset/Charset.java @@ -26,7 +26,7 @@ package java.nio.charset; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class Charset implements java.lang.Comparable<java.nio.charset.Charset> { diff --git a/ojluni/annotations/hiddenapi/java/nio/charset/CharsetEncoder.java b/ojluni/annotations/hiddenapi/java/nio/charset/CharsetEncoder.java index f053caed99..0e0fd2da71 100644 --- a/ojluni/annotations/hiddenapi/java/nio/charset/CharsetEncoder.java +++ b/ojluni/annotations/hiddenapi/java/nio/charset/CharsetEncoder.java @@ -28,7 +28,7 @@ package java.nio.charset; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class CharsetEncoder { diff --git a/ojluni/annotations/hiddenapi/java/nio/file/FileTreeWalker.java b/ojluni/annotations/hiddenapi/java/nio/file/FileTreeWalker.java index d3e6a425a3..0f9ae1e99c 100644 --- a/ojluni/annotations/hiddenapi/java/nio/file/FileTreeWalker.java +++ b/ojluni/annotations/hiddenapi/java/nio/file/FileTreeWalker.java @@ -72,20 +72,20 @@ class FileTreeWalker implements java.io.Closeable { private boolean closed; - @dalvik.annotation.compat.UnsupportedAppUsage private final boolean followLinks; + @android.compat.annotation.UnsupportedAppUsage private final boolean followLinks; { followLinks = false; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private final java.nio.file.LinkOption[] linkOptions; { linkOptions = new java.nio.file.LinkOption[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage private final int maxDepth; + @android.compat.annotation.UnsupportedAppUsage private final int maxDepth; { maxDepth = 0; diff --git a/ojluni/annotations/hiddenapi/java/security/KeyPairGenerator.java b/ojluni/annotations/hiddenapi/java/security/KeyPairGenerator.java index 2dba7cd62f..e5ceb2a87b 100644 --- a/ojluni/annotations/hiddenapi/java/security/KeyPairGenerator.java +++ b/ojluni/annotations/hiddenapi/java/security/KeyPairGenerator.java @@ -25,7 +25,7 @@ package java.security; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class KeyPairGenerator extends java.security.KeyPairGeneratorSpi { diff --git a/ojluni/annotations/hiddenapi/java/security/KeyStore.java b/ojluni/annotations/hiddenapi/java/security/KeyStore.java index ae64169905..6bf29a17ca 100644 --- a/ojluni/annotations/hiddenapi/java/security/KeyStore.java +++ b/ojluni/annotations/hiddenapi/java/security/KeyStore.java @@ -25,7 +25,7 @@ package java.security; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class KeyStore { diff --git a/ojluni/annotations/hiddenapi/java/security/Signature.java b/ojluni/annotations/hiddenapi/java/security/Signature.java index a249f65913..f9d4ab7cae 100644 --- a/ojluni/annotations/hiddenapi/java/security/Signature.java +++ b/ojluni/annotations/hiddenapi/java/security/Signature.java @@ -26,7 +26,7 @@ package java.security; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class Signature extends java.security.SignatureSpi { diff --git a/ojluni/annotations/hiddenapi/java/security/spec/ECParameterSpec.java b/ojluni/annotations/hiddenapi/java/security/spec/ECParameterSpec.java index db13a4b8fa..316678767a 100644 --- a/ojluni/annotations/hiddenapi/java/security/spec/ECParameterSpec.java +++ b/ojluni/annotations/hiddenapi/java/security/spec/ECParameterSpec.java @@ -26,7 +26,7 @@ package java.security.spec; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ECParameterSpec implements java.security.spec.AlgorithmParameterSpec { diff --git a/ojluni/annotations/hiddenapi/java/text/Collator.java b/ojluni/annotations/hiddenapi/java/text/Collator.java index 82aa868d70..befb9b9591 100644 --- a/ojluni/annotations/hiddenapi/java/text/Collator.java +++ b/ojluni/annotations/hiddenapi/java/text/Collator.java @@ -39,7 +39,7 @@ package java.text; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class Collator diff --git a/ojluni/annotations/hiddenapi/java/text/DateFormat.java b/ojluni/annotations/hiddenapi/java/text/DateFormat.java index 7a1973feeb..2b8ed78bb4 100644 --- a/ojluni/annotations/hiddenapi/java/text/DateFormat.java +++ b/ojluni/annotations/hiddenapi/java/text/DateFormat.java @@ -39,7 +39,7 @@ package java.text; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class DateFormat extends java.text.Format { diff --git a/ojluni/annotations/hiddenapi/java/text/DecimalFormatSymbols.java b/ojluni/annotations/hiddenapi/java/text/DecimalFormatSymbols.java index 52395a9ba1..1b0a68cae8 100644 --- a/ojluni/annotations/hiddenapi/java/text/DecimalFormatSymbols.java +++ b/ojluni/annotations/hiddenapi/java/text/DecimalFormatSymbols.java @@ -39,7 +39,7 @@ package java.text; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class DecimalFormatSymbols implements java.lang.Cloneable, java.io.Serializable { diff --git a/ojluni/annotations/hiddenapi/java/text/NumberFormat.java b/ojluni/annotations/hiddenapi/java/text/NumberFormat.java index a570716c59..232c94ff60 100644 --- a/ojluni/annotations/hiddenapi/java/text/NumberFormat.java +++ b/ojluni/annotations/hiddenapi/java/text/NumberFormat.java @@ -39,7 +39,7 @@ package java.text; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class NumberFormat extends java.text.Format { diff --git a/ojluni/annotations/hiddenapi/java/time/Duration.java b/ojluni/annotations/hiddenapi/java/time/Duration.java index 3090adb09c..ca9983261a 100644 --- a/ojluni/annotations/hiddenapi/java/time/Duration.java +++ b/ojluni/annotations/hiddenapi/java/time/Duration.java @@ -62,7 +62,7 @@ package java.time; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class Duration diff --git a/ojluni/annotations/hiddenapi/java/time/OffsetDateTime.java b/ojluni/annotations/hiddenapi/java/time/OffsetDateTime.java index f95f12f50c..d4822c47bf 100644 --- a/ojluni/annotations/hiddenapi/java/time/OffsetDateTime.java +++ b/ojluni/annotations/hiddenapi/java/time/OffsetDateTime.java @@ -62,7 +62,7 @@ package java.time; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class OffsetDateTime diff --git a/ojluni/annotations/hiddenapi/java/time/ZoneId.java b/ojluni/annotations/hiddenapi/java/time/ZoneId.java index f3ae76a318..ef4a7aa72c 100644 --- a/ojluni/annotations/hiddenapi/java/time/ZoneId.java +++ b/ojluni/annotations/hiddenapi/java/time/ZoneId.java @@ -62,7 +62,7 @@ package java.time; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class ZoneId implements java.io.Serializable { diff --git a/ojluni/annotations/hiddenapi/java/util/ArrayDeque.java b/ojluni/annotations/hiddenapi/java/util/ArrayDeque.java index 59315d81ee..65c684ae8d 100644 --- a/ojluni/annotations/hiddenapi/java/util/ArrayDeque.java +++ b/ojluni/annotations/hiddenapi/java/util/ArrayDeque.java @@ -34,7 +34,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ArrayDeque<E> extends java.util.AbstractCollection<E> diff --git a/ojluni/annotations/hiddenapi/java/util/ArrayList.java b/ojluni/annotations/hiddenapi/java/util/ArrayList.java index 1131ab9501..3d90fa5cfb 100644 --- a/ojluni/annotations/hiddenapi/java/util/ArrayList.java +++ b/ojluni/annotations/hiddenapi/java/util/ArrayList.java @@ -26,7 +26,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ArrayList<E> extends java.util.AbstractList<E> diff --git a/ojluni/annotations/hiddenapi/java/util/Arrays.java b/ojluni/annotations/hiddenapi/java/util/Arrays.java index c763a2d538..040c8b0b3a 100644 --- a/ojluni/annotations/hiddenapi/java/util/Arrays.java +++ b/ojluni/annotations/hiddenapi/java/util/Arrays.java @@ -26,7 +26,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Arrays { diff --git a/ojluni/annotations/hiddenapi/java/util/Calendar.java b/ojluni/annotations/hiddenapi/java/util/Calendar.java index 99a76f7df8..274f801937 100644 --- a/ojluni/annotations/hiddenapi/java/util/Calendar.java +++ b/ojluni/annotations/hiddenapi/java/util/Calendar.java @@ -39,7 +39,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class Calendar diff --git a/ojluni/annotations/hiddenapi/java/util/Collections.java b/ojluni/annotations/hiddenapi/java/util/Collections.java index 010ba3df61..d7445f0276 100644 --- a/ojluni/annotations/hiddenapi/java/util/Collections.java +++ b/ojluni/annotations/hiddenapi/java/util/Collections.java @@ -26,7 +26,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Collections { diff --git a/ojluni/annotations/hiddenapi/java/util/EnumMap.java b/ojluni/annotations/hiddenapi/java/util/EnumMap.java index 81cd885805..5b0c31f353 100644 --- a/ojluni/annotations/hiddenapi/java/util/EnumMap.java +++ b/ojluni/annotations/hiddenapi/java/util/EnumMap.java @@ -26,7 +26,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class EnumMap<K extends java.lang.Enum<K>, V> extends java.util.AbstractMap<K, V> diff --git a/ojluni/annotations/hiddenapi/java/util/EnumSet.java b/ojluni/annotations/hiddenapi/java/util/EnumSet.java index f8edb19843..6c920b02ca 100644 --- a/ojluni/annotations/hiddenapi/java/util/EnumSet.java +++ b/ojluni/annotations/hiddenapi/java/util/EnumSet.java @@ -26,7 +26,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class EnumSet<E extends java.lang.Enum<E>> extends java.util.AbstractSet<E> diff --git a/ojluni/annotations/hiddenapi/java/util/HashMap.java b/ojluni/annotations/hiddenapi/java/util/HashMap.java index af1c3425ce..b13c25c75e 100644 --- a/ojluni/annotations/hiddenapi/java/util/HashMap.java +++ b/ojluni/annotations/hiddenapi/java/util/HashMap.java @@ -25,7 +25,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class HashMap<K, V> extends java.util.AbstractMap<K, V> diff --git a/ojluni/annotations/hiddenapi/java/util/HashSet.java b/ojluni/annotations/hiddenapi/java/util/HashSet.java index a006121932..896c1aa81d 100644 --- a/ojluni/annotations/hiddenapi/java/util/HashSet.java +++ b/ojluni/annotations/hiddenapi/java/util/HashSet.java @@ -25,7 +25,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class HashSet<E> extends java.util.AbstractSet<E> diff --git a/ojluni/annotations/hiddenapi/java/util/LinkedHashMap.java b/ojluni/annotations/hiddenapi/java/util/LinkedHashMap.java index 8294334eb0..99d649ba68 100644 --- a/ojluni/annotations/hiddenapi/java/util/LinkedHashMap.java +++ b/ojluni/annotations/hiddenapi/java/util/LinkedHashMap.java @@ -25,7 +25,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class LinkedHashMap<K, V> extends java.util.HashMap<K, V> implements java.util.Map<K, V> { diff --git a/ojluni/annotations/hiddenapi/java/util/LinkedList.java b/ojluni/annotations/hiddenapi/java/util/LinkedList.java index c7eb0488d0..58cbb5f455 100644 --- a/ojluni/annotations/hiddenapi/java/util/LinkedList.java +++ b/ojluni/annotations/hiddenapi/java/util/LinkedList.java @@ -25,7 +25,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class LinkedList<E> extends java.util.AbstractSequentialList<E> diff --git a/ojluni/annotations/hiddenapi/java/util/Locale.java b/ojluni/annotations/hiddenapi/java/util/Locale.java index 3f6a54fea1..73d2dfa98d 100644 --- a/ojluni/annotations/hiddenapi/java/util/Locale.java +++ b/ojluni/annotations/hiddenapi/java/util/Locale.java @@ -41,7 +41,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class Locale implements java.lang.Cloneable, java.io.Serializable { diff --git a/ojluni/annotations/hiddenapi/java/util/PriorityQueue.java b/ojluni/annotations/hiddenapi/java/util/PriorityQueue.java index b8d2a1818f..09c9d86f2e 100644 --- a/ojluni/annotations/hiddenapi/java/util/PriorityQueue.java +++ b/ojluni/annotations/hiddenapi/java/util/PriorityQueue.java @@ -25,7 +25,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class PriorityQueue<E> extends java.util.AbstractQueue<E> implements java.io.Serializable { diff --git a/ojluni/annotations/hiddenapi/java/util/Properties.java b/ojluni/annotations/hiddenapi/java/util/Properties.java index 3aee2d179e..397fa753ca 100644 --- a/ojluni/annotations/hiddenapi/java/util/Properties.java +++ b/ojluni/annotations/hiddenapi/java/util/Properties.java @@ -26,7 +26,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Properties extends java.util.Hashtable<java.lang.Object, java.lang.Object> { diff --git a/ojluni/annotations/hiddenapi/java/util/Random.java b/ojluni/annotations/hiddenapi/java/util/Random.java index ce80aa13f4..930688a6c1 100644 --- a/ojluni/annotations/hiddenapi/java/util/Random.java +++ b/ojluni/annotations/hiddenapi/java/util/Random.java @@ -25,7 +25,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Random implements java.io.Serializable { diff --git a/ojluni/annotations/hiddenapi/java/util/TimerTask.java b/ojluni/annotations/hiddenapi/java/util/TimerTask.java index 8a5c6d5aa4..65c845c03a 100644 --- a/ojluni/annotations/hiddenapi/java/util/TimerTask.java +++ b/ojluni/annotations/hiddenapi/java/util/TimerTask.java @@ -25,7 +25,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class TimerTask implements java.lang.Runnable { diff --git a/ojluni/annotations/hiddenapi/java/util/UUID.java b/ojluni/annotations/hiddenapi/java/util/UUID.java index 0585e5dea4..353f2b6135 100644 --- a/ojluni/annotations/hiddenapi/java/util/UUID.java +++ b/ojluni/annotations/hiddenapi/java/util/UUID.java @@ -25,7 +25,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class UUID implements java.io.Serializable, java.lang.Comparable<java.util.UUID> { diff --git a/ojluni/annotations/hiddenapi/java/util/Vector.java b/ojluni/annotations/hiddenapi/java/util/Vector.java index 394a097859..91a6aa70b0 100644 --- a/ojluni/annotations/hiddenapi/java/util/Vector.java +++ b/ojluni/annotations/hiddenapi/java/util/Vector.java @@ -25,7 +25,7 @@ package java.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Vector<E> extends java.util.AbstractList<E> diff --git a/ojluni/annotations/hiddenapi/java/util/concurrent/CopyOnWriteArrayList.java b/ojluni/annotations/hiddenapi/java/util/concurrent/CopyOnWriteArrayList.java index 7d526a723a..5a19180997 100644 --- a/ojluni/annotations/hiddenapi/java/util/concurrent/CopyOnWriteArrayList.java +++ b/ojluni/annotations/hiddenapi/java/util/concurrent/CopyOnWriteArrayList.java @@ -34,7 +34,7 @@ package java.util.concurrent; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class CopyOnWriteArrayList<E> diff --git a/ojluni/annotations/hiddenapi/java/util/concurrent/CopyOnWriteArraySet.java b/ojluni/annotations/hiddenapi/java/util/concurrent/CopyOnWriteArraySet.java index 98c53b0db7..2450ff4d99 100644 --- a/ojluni/annotations/hiddenapi/java/util/concurrent/CopyOnWriteArraySet.java +++ b/ojluni/annotations/hiddenapi/java/util/concurrent/CopyOnWriteArraySet.java @@ -35,7 +35,7 @@ package java.util.concurrent; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class CopyOnWriteArraySet<E> extends java.util.AbstractSet<E> diff --git a/ojluni/annotations/hiddenapi/java/util/concurrent/Executors.java b/ojluni/annotations/hiddenapi/java/util/concurrent/Executors.java index 1fbd62cebf..cd64ac80a3 100644 --- a/ojluni/annotations/hiddenapi/java/util/concurrent/Executors.java +++ b/ojluni/annotations/hiddenapi/java/util/concurrent/Executors.java @@ -35,7 +35,7 @@ package java.util.concurrent; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Executors { diff --git a/ojluni/annotations/hiddenapi/java/util/concurrent/FutureTask.java b/ojluni/annotations/hiddenapi/java/util/concurrent/FutureTask.java index 22746114f2..24746d4f13 100644 --- a/ojluni/annotations/hiddenapi/java/util/concurrent/FutureTask.java +++ b/ojluni/annotations/hiddenapi/java/util/concurrent/FutureTask.java @@ -35,7 +35,7 @@ package java.util.concurrent; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class FutureTask<V> implements java.util.concurrent.RunnableFuture<V> { diff --git a/ojluni/annotations/hiddenapi/java/util/concurrent/LinkedBlockingDeque.java b/ojluni/annotations/hiddenapi/java/util/concurrent/LinkedBlockingDeque.java index de84037a6a..391ba63113 100644 --- a/ojluni/annotations/hiddenapi/java/util/concurrent/LinkedBlockingDeque.java +++ b/ojluni/annotations/hiddenapi/java/util/concurrent/LinkedBlockingDeque.java @@ -35,7 +35,7 @@ package java.util.concurrent; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class LinkedBlockingDeque<E> extends java.util.AbstractQueue<E> diff --git a/ojluni/annotations/hiddenapi/java/util/concurrent/LinkedBlockingQueue.java b/ojluni/annotations/hiddenapi/java/util/concurrent/LinkedBlockingQueue.java index f7aec5c622..683a8f1bfd 100644 --- a/ojluni/annotations/hiddenapi/java/util/concurrent/LinkedBlockingQueue.java +++ b/ojluni/annotations/hiddenapi/java/util/concurrent/LinkedBlockingQueue.java @@ -35,7 +35,7 @@ package java.util.concurrent; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class LinkedBlockingQueue<E> extends java.util.AbstractQueue<E> diff --git a/ojluni/annotations/hiddenapi/java/util/concurrent/PriorityBlockingQueue.java b/ojluni/annotations/hiddenapi/java/util/concurrent/PriorityBlockingQueue.java index 0577e8c41e..35bc3c06fe 100644 --- a/ojluni/annotations/hiddenapi/java/util/concurrent/PriorityBlockingQueue.java +++ b/ojluni/annotations/hiddenapi/java/util/concurrent/PriorityBlockingQueue.java @@ -35,7 +35,7 @@ package java.util.concurrent; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class PriorityBlockingQueue<E> extends java.util.AbstractQueue<E> diff --git a/ojluni/annotations/hiddenapi/java/util/concurrent/ThreadPoolExecutor.java b/ojluni/annotations/hiddenapi/java/util/concurrent/ThreadPoolExecutor.java index e89f678bbd..0d2771151c 100644 --- a/ojluni/annotations/hiddenapi/java/util/concurrent/ThreadPoolExecutor.java +++ b/ojluni/annotations/hiddenapi/java/util/concurrent/ThreadPoolExecutor.java @@ -35,7 +35,7 @@ package java.util.concurrent; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ThreadPoolExecutor extends java.util.concurrent.AbstractExecutorService { diff --git a/ojluni/annotations/hiddenapi/java/util/concurrent/atomic/AtomicInteger.java b/ojluni/annotations/hiddenapi/java/util/concurrent/atomic/AtomicInteger.java index a5718ac13e..ed7ef76cea 100644 --- a/ojluni/annotations/hiddenapi/java/util/concurrent/atomic/AtomicInteger.java +++ b/ojluni/annotations/hiddenapi/java/util/concurrent/atomic/AtomicInteger.java @@ -35,7 +35,7 @@ package java.util.concurrent.atomic; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class AtomicInteger extends java.lang.Number implements java.io.Serializable { diff --git a/ojluni/annotations/hiddenapi/java/util/concurrent/locks/ReentrantLock.java b/ojluni/annotations/hiddenapi/java/util/concurrent/locks/ReentrantLock.java index 1ad6e8d617..892120809a 100644 --- a/ojluni/annotations/hiddenapi/java/util/concurrent/locks/ReentrantLock.java +++ b/ojluni/annotations/hiddenapi/java/util/concurrent/locks/ReentrantLock.java @@ -35,7 +35,7 @@ package java.util.concurrent.locks; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ReentrantLock implements java.util.concurrent.locks.Lock, java.io.Serializable { diff --git a/ojluni/annotations/hiddenapi/java/util/jar/JarFile.java b/ojluni/annotations/hiddenapi/java/util/jar/JarFile.java index 1c97964cd3..3c7d7bb30f 100644 --- a/ojluni/annotations/hiddenapi/java/util/jar/JarFile.java +++ b/ojluni/annotations/hiddenapi/java/util/jar/JarFile.java @@ -26,7 +26,7 @@ package java.util.jar; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class JarFile extends java.util.zip.ZipFile { diff --git a/ojluni/annotations/hiddenapi/java/util/logging/Handler.java b/ojluni/annotations/hiddenapi/java/util/logging/Handler.java index 2d04f15fdb..7243f48b6b 100644 --- a/ojluni/annotations/hiddenapi/java/util/logging/Handler.java +++ b/ojluni/annotations/hiddenapi/java/util/logging/Handler.java @@ -25,7 +25,7 @@ package java.util.logging; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class Handler { diff --git a/ojluni/annotations/hiddenapi/java/util/logging/LogManager.java b/ojluni/annotations/hiddenapi/java/util/logging/LogManager.java index a140100388..8900a5a898 100644 --- a/ojluni/annotations/hiddenapi/java/util/logging/LogManager.java +++ b/ojluni/annotations/hiddenapi/java/util/logging/LogManager.java @@ -26,7 +26,7 @@ package java.util.logging; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class LogManager { diff --git a/ojluni/annotations/hiddenapi/java/util/logging/Logger.java b/ojluni/annotations/hiddenapi/java/util/logging/Logger.java index f504c96017..1c14d54b59 100644 --- a/ojluni/annotations/hiddenapi/java/util/logging/Logger.java +++ b/ojluni/annotations/hiddenapi/java/util/logging/Logger.java @@ -25,7 +25,7 @@ package java.util.logging; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Logger { diff --git a/ojluni/annotations/hiddenapi/java/util/regex/Matcher.java b/ojluni/annotations/hiddenapi/java/util/regex/Matcher.java index 18d6d95812..686f1bdb53 100644 --- a/ojluni/annotations/hiddenapi/java/util/regex/Matcher.java +++ b/ojluni/annotations/hiddenapi/java/util/regex/Matcher.java @@ -26,7 +26,7 @@ package java.util.regex; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class Matcher implements java.util.regex.MatchResult { diff --git a/ojluni/annotations/hiddenapi/java/util/zip/Adler32.java b/ojluni/annotations/hiddenapi/java/util/zip/Adler32.java index f78844fa16..e22aec40b8 100644 --- a/ojluni/annotations/hiddenapi/java/util/zip/Adler32.java +++ b/ojluni/annotations/hiddenapi/java/util/zip/Adler32.java @@ -25,7 +25,7 @@ package java.util.zip; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Adler32 implements java.util.zip.Checksum { diff --git a/ojluni/annotations/hiddenapi/java/util/zip/CRC32.java b/ojluni/annotations/hiddenapi/java/util/zip/CRC32.java index 0e25349eda..6766fa18a4 100644 --- a/ojluni/annotations/hiddenapi/java/util/zip/CRC32.java +++ b/ojluni/annotations/hiddenapi/java/util/zip/CRC32.java @@ -25,7 +25,7 @@ package java.util.zip; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class CRC32 implements java.util.zip.Checksum { diff --git a/ojluni/annotations/hiddenapi/java/util/zip/Deflater.java b/ojluni/annotations/hiddenapi/java/util/zip/Deflater.java index f8f419d3b2..0dbe2a5f2f 100644 --- a/ojluni/annotations/hiddenapi/java/util/zip/Deflater.java +++ b/ojluni/annotations/hiddenapi/java/util/zip/Deflater.java @@ -25,7 +25,7 @@ package java.util.zip; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Deflater { diff --git a/ojluni/annotations/hiddenapi/java/util/zip/Inflater.java b/ojluni/annotations/hiddenapi/java/util/zip/Inflater.java index c4194d2f64..e5a5dccfeb 100644 --- a/ojluni/annotations/hiddenapi/java/util/zip/Inflater.java +++ b/ojluni/annotations/hiddenapi/java/util/zip/Inflater.java @@ -26,7 +26,7 @@ package java.util.zip; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Inflater { diff --git a/ojluni/annotations/hiddenapi/java/util/zip/ZipEntry.java b/ojluni/annotations/hiddenapi/java/util/zip/ZipEntry.java index 87ca0f58fe..91440c2813 100644 --- a/ojluni/annotations/hiddenapi/java/util/zip/ZipEntry.java +++ b/ojluni/annotations/hiddenapi/java/util/zip/ZipEntry.java @@ -26,7 +26,7 @@ package java.util.zip; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ZipEntry implements java.util.zip.ZipConstants, java.lang.Cloneable { diff --git a/ojluni/annotations/hiddenapi/java/util/zip/ZipFile.java b/ojluni/annotations/hiddenapi/java/util/zip/ZipFile.java index 371659ae56..b2c72a79a9 100644 --- a/ojluni/annotations/hiddenapi/java/util/zip/ZipFile.java +++ b/ojluni/annotations/hiddenapi/java/util/zip/ZipFile.java @@ -26,7 +26,7 @@ package java.util.zip; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ZipFile implements java.util.zip.ZipConstants, java.io.Closeable { diff --git a/ojluni/annotations/hiddenapi/java/util/zip/ZipInputStream.java b/ojluni/annotations/hiddenapi/java/util/zip/ZipInputStream.java index 90947b77cc..18c1b2e2cd 100644 --- a/ojluni/annotations/hiddenapi/java/util/zip/ZipInputStream.java +++ b/ojluni/annotations/hiddenapi/java/util/zip/ZipInputStream.java @@ -26,7 +26,7 @@ package java.util.zip; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ZipInputStream extends java.util.zip.InflaterInputStream diff --git a/ojluni/annotations/hiddenapi/java/util/zip/ZipOutputStream.java b/ojluni/annotations/hiddenapi/java/util/zip/ZipOutputStream.java index 943fefa93c..fd4276a47d 100644 --- a/ojluni/annotations/hiddenapi/java/util/zip/ZipOutputStream.java +++ b/ojluni/annotations/hiddenapi/java/util/zip/ZipOutputStream.java @@ -26,7 +26,7 @@ package java.util.zip; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ZipOutputStream extends java.util.zip.DeflaterOutputStream diff --git a/ojluni/annotations/hiddenapi/javax/net/ssl/SSLServerSocketFactory.java b/ojluni/annotations/hiddenapi/javax/net/ssl/SSLServerSocketFactory.java index 8226c7555d..e947a88e94 100644 --- a/ojluni/annotations/hiddenapi/javax/net/ssl/SSLServerSocketFactory.java +++ b/ojluni/annotations/hiddenapi/javax/net/ssl/SSLServerSocketFactory.java @@ -26,7 +26,7 @@ package javax.net.ssl; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.compat.VersionCodes; @SuppressWarnings({"unchecked", "deprecation", "all"}) diff --git a/ojluni/annotations/hiddenapi/javax/net/ssl/SSLSocketFactory.java b/ojluni/annotations/hiddenapi/javax/net/ssl/SSLSocketFactory.java index e79418d7c5..b945122a90 100644 --- a/ojluni/annotations/hiddenapi/javax/net/ssl/SSLSocketFactory.java +++ b/ojluni/annotations/hiddenapi/javax/net/ssl/SSLSocketFactory.java @@ -26,7 +26,7 @@ package javax.net.ssl; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.compat.VersionCodes; @SuppressWarnings({"unchecked", "deprecation", "all"}) diff --git a/ojluni/annotations/hiddenapi/sun/misc/ASCIICaseInsensitiveComparator.java b/ojluni/annotations/hiddenapi/sun/misc/ASCIICaseInsensitiveComparator.java index b632c1e197..2df53e2a88 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/ASCIICaseInsensitiveComparator.java +++ b/ojluni/annotations/hiddenapi/sun/misc/ASCIICaseInsensitiveComparator.java @@ -36,7 +36,7 @@ public class ASCIICaseInsensitiveComparator implements java.util.Comparator<java throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static int lowerCaseHashCode(java.lang.String s) { throw new RuntimeException("Stub!"); } @@ -57,7 +57,7 @@ public class ASCIICaseInsensitiveComparator implements java.util.Comparator<java throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final java.util.Comparator<java.lang.String> CASE_INSENSITIVE_ORDER; static { diff --git a/ojluni/annotations/hiddenapi/sun/misc/BASE64Decoder.java b/ojluni/annotations/hiddenapi/sun/misc/BASE64Decoder.java index 2ce6dc81af..65b468282a 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/BASE64Decoder.java +++ b/ojluni/annotations/hiddenapi/sun/misc/BASE64Decoder.java @@ -28,7 +28,7 @@ package sun.misc; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class BASE64Decoder extends sun.misc.CharacterDecoder { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public BASE64Decoder() { throw new RuntimeException("Stub!"); } @@ -55,7 +55,7 @@ public class BASE64Decoder extends sun.misc.CharacterDecoder { pem_array = new char[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage private static final byte[] pem_convert_array; + @android.compat.annotation.UnsupportedAppUsage private static final byte[] pem_convert_array; static { pem_convert_array = new byte[0]; diff --git a/ojluni/annotations/hiddenapi/sun/misc/BASE64Encoder.java b/ojluni/annotations/hiddenapi/sun/misc/BASE64Encoder.java index 8a9ef70301..146b54350f 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/BASE64Encoder.java +++ b/ojluni/annotations/hiddenapi/sun/misc/BASE64Encoder.java @@ -28,7 +28,7 @@ package sun.misc; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class BASE64Encoder extends sun.misc.CharacterEncoder { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public BASE64Encoder() { throw new RuntimeException("Stub!"); } @@ -46,7 +46,7 @@ public class BASE64Encoder extends sun.misc.CharacterEncoder { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage private static final char[] pem_array; + @android.compat.annotation.UnsupportedAppUsage private static final char[] pem_array; static { pem_array = new char[0]; diff --git a/ojluni/annotations/hiddenapi/sun/misc/CEFormatException.java b/ojluni/annotations/hiddenapi/sun/misc/CEFormatException.java index d351479cb6..d52e699f34 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/CEFormatException.java +++ b/ojluni/annotations/hiddenapi/sun/misc/CEFormatException.java @@ -28,7 +28,7 @@ package sun.misc; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class CEFormatException extends java.io.IOException { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public CEFormatException(java.lang.String s) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/misc/CEStreamExhausted.java b/ojluni/annotations/hiddenapi/sun/misc/CEStreamExhausted.java index e696c671a2..e78d20ea8d 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/CEStreamExhausted.java +++ b/ojluni/annotations/hiddenapi/sun/misc/CEStreamExhausted.java @@ -28,7 +28,7 @@ package sun.misc; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class CEStreamExhausted extends java.io.IOException { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public CEStreamExhausted() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/misc/CharacterDecoder.java b/ojluni/annotations/hiddenapi/sun/misc/CharacterDecoder.java index de6f9421fd..1b769fac94 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/CharacterDecoder.java +++ b/ojluni/annotations/hiddenapi/sun/misc/CharacterDecoder.java @@ -29,7 +29,7 @@ package sun.misc; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class CharacterDecoder { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public CharacterDecoder() { throw new RuntimeException("Stub!"); } @@ -78,7 +78,7 @@ public abstract class CharacterDecoder { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] decodeBuffer(java.lang.String inputString) throws java.io.IOException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/misc/CharacterEncoder.java b/ojluni/annotations/hiddenapi/sun/misc/CharacterEncoder.java index bbbf3f72b7..b254846bf1 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/CharacterEncoder.java +++ b/ojluni/annotations/hiddenapi/sun/misc/CharacterEncoder.java @@ -29,7 +29,7 @@ package sun.misc; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class CharacterEncoder { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public CharacterEncoder() { throw new RuntimeException("Stub!"); } @@ -38,7 +38,7 @@ public abstract class CharacterEncoder { protected abstract int bytesPerLine(); - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage protected void encodeBufferPrefix(java.io.OutputStream aStream) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -73,7 +73,7 @@ public abstract class CharacterEncoder { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.String encode(byte[] aBuffer) { throw new RuntimeException("Stub!"); } @@ -101,7 +101,7 @@ public abstract class CharacterEncoder { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.String encodeBuffer(byte[] aBuffer) { throw new RuntimeException("Stub!"); } @@ -115,6 +115,6 @@ public abstract class CharacterEncoder { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage protected java.io.PrintStream pStream; } diff --git a/ojluni/annotations/hiddenapi/sun/misc/Cleaner.java b/ojluni/annotations/hiddenapi/sun/misc/Cleaner.java index eb21393821..cdbc65882f 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/Cleaner.java +++ b/ojluni/annotations/hiddenapi/sun/misc/Cleaner.java @@ -25,7 +25,7 @@ package sun.misc; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class Cleaner extends java.lang.ref.PhantomReference<java.lang.Object> { diff --git a/ojluni/annotations/hiddenapi/sun/misc/FloatingDecimal.java b/ojluni/annotations/hiddenapi/sun/misc/FloatingDecimal.java index 0c210ace97..fd8c6680fd 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/FloatingDecimal.java +++ b/ojluni/annotations/hiddenapi/sun/misc/FloatingDecimal.java @@ -86,17 +86,17 @@ public class FloatingDecimal { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage static java.lang.String stripLeadingZeros(java.lang.String s) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage static int getHexDigit(java.lang.String s, int position) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage private static boolean $assertionsDisabled; + @android.compat.annotation.UnsupportedAppUsage private static boolean $assertionsDisabled; static final sun.misc.FloatingDecimal.ASCIIToBinaryConverter A2BC_NEGATIVE_INFINITY; diff --git a/ojluni/annotations/hiddenapi/sun/misc/FormattedFloatingDecimal.java b/ojluni/annotations/hiddenapi/sun/misc/FormattedFloatingDecimal.java index b6766cfdc3..a7529316fe 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/FormattedFloatingDecimal.java +++ b/ojluni/annotations/hiddenapi/sun/misc/FormattedFloatingDecimal.java @@ -79,7 +79,7 @@ public class FormattedFloatingDecimal { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage private static boolean $assertionsDisabled; + @android.compat.annotation.UnsupportedAppUsage private static boolean $assertionsDisabled; private int decExponentRounded; @@ -95,11 +95,11 @@ public class FormattedFloatingDecimal { @SuppressWarnings({"unchecked", "deprecation", "all"}) public static enum Form { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage SCIENTIFIC, - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage COMPATIBLE, - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage DECIMAL_FLOAT, GENERAL; diff --git a/ojluni/annotations/hiddenapi/sun/misc/FpUtils.java b/ojluni/annotations/hiddenapi/sun/misc/FpUtils.java index 38347bd426..16bb5b0880 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/FpUtils.java +++ b/ojluni/annotations/hiddenapi/sun/misc/FpUtils.java @@ -43,7 +43,7 @@ public class FpUtils { } @Deprecated - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static double rawCopySign(double magnitude, double sign) { throw new RuntimeException("Stub!"); } @@ -165,5 +165,5 @@ public class FpUtils { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage private static boolean $assertionsDisabled; + @android.compat.annotation.UnsupportedAppUsage private static boolean $assertionsDisabled; } diff --git a/ojluni/annotations/hiddenapi/sun/misc/HexDumpEncoder.java b/ojluni/annotations/hiddenapi/sun/misc/HexDumpEncoder.java index f278c74a9d..c92af9ae54 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/HexDumpEncoder.java +++ b/ojluni/annotations/hiddenapi/sun/misc/HexDumpEncoder.java @@ -28,7 +28,7 @@ package sun.misc; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class HexDumpEncoder extends sun.misc.CharacterEncoder { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public HexDumpEncoder() { throw new RuntimeException("Stub!"); } @@ -62,11 +62,11 @@ public class HexDumpEncoder extends sun.misc.CharacterEncoder { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage private int currentByte; + @android.compat.annotation.UnsupportedAppUsage private int currentByte; - @dalvik.annotation.compat.UnsupportedAppUsage private int offset; + @android.compat.annotation.UnsupportedAppUsage private int offset; - @dalvik.annotation.compat.UnsupportedAppUsage private byte[] thisLine; + @android.compat.annotation.UnsupportedAppUsage private byte[] thisLine; - @dalvik.annotation.compat.UnsupportedAppUsage private int thisLineLength; + @android.compat.annotation.UnsupportedAppUsage private int thisLineLength; } diff --git a/ojluni/annotations/hiddenapi/sun/misc/IOUtils.java b/ojluni/annotations/hiddenapi/sun/misc/IOUtils.java index 90f7909572..251261bb4e 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/IOUtils.java +++ b/ojluni/annotations/hiddenapi/sun/misc/IOUtils.java @@ -34,7 +34,7 @@ public class IOUtils { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static byte[] readFully(java.io.InputStream is, int length, boolean readAll) throws java.io.IOException { throw new RuntimeException("Stub!"); diff --git a/ojluni/annotations/hiddenapi/sun/misc/JarIndex.java b/ojluni/annotations/hiddenapi/sun/misc/JarIndex.java index 06187e143f..a93d1de628 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/JarIndex.java +++ b/ojluni/annotations/hiddenapi/sun/misc/JarIndex.java @@ -41,7 +41,7 @@ public class JarIndex { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public JarIndex(java.lang.String[] files) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -83,7 +83,7 @@ public class JarIndex { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void write(java.io.OutputStream out) throws java.io.IOException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/misc/MessageUtils.java b/ojluni/annotations/hiddenapi/sun/misc/MessageUtils.java index bd61419922..9fe08e4417 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/MessageUtils.java +++ b/ojluni/annotations/hiddenapi/sun/misc/MessageUtils.java @@ -29,7 +29,7 @@ package sun.misc; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class MessageUtils { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public MessageUtils() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/misc/MetaIndex.java b/ojluni/annotations/hiddenapi/sun/misc/MetaIndex.java index b3ae0cce04..4c38d4138d 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/MetaIndex.java +++ b/ojluni/annotations/hiddenapi/sun/misc/MetaIndex.java @@ -33,12 +33,12 @@ public class MetaIndex { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static sun.misc.MetaIndex forJar(java.io.File jar) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static synchronized void registerDirectory(java.io.File dir) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/misc/URLClassPath.java b/ojluni/annotations/hiddenapi/sun/misc/URLClassPath.java index 7ca8bd92b7..561a21c01f 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/URLClassPath.java +++ b/ojluni/annotations/hiddenapi/sun/misc/URLClassPath.java @@ -26,7 +26,7 @@ package sun.misc; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class URLClassPath { diff --git a/ojluni/annotations/hiddenapi/sun/misc/Unsafe.java b/ojluni/annotations/hiddenapi/sun/misc/Unsafe.java index f560d966c9..c6dad00190 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/Unsafe.java +++ b/ojluni/annotations/hiddenapi/sun/misc/Unsafe.java @@ -25,7 +25,8 @@ package sun.misc; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; + import dalvik.annotation.compat.VersionCodes; @SuppressWarnings({"unchecked", "deprecation", "all"}) diff --git a/ojluni/annotations/hiddenapi/sun/misc/VM.java b/ojluni/annotations/hiddenapi/sun/misc/VM.java index 979818cb0a..a043c573bf 100644 --- a/ojluni/annotations/hiddenapi/sun/misc/VM.java +++ b/ojluni/annotations/hiddenapi/sun/misc/VM.java @@ -83,7 +83,7 @@ public class VM { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static long maxDirectMemory() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/net/ftp/FtpClient.java b/ojluni/annotations/hiddenapi/sun/net/ftp/FtpClient.java index c60accd409..0a54520153 100644 --- a/ojluni/annotations/hiddenapi/sun/net/ftp/FtpClient.java +++ b/ojluni/annotations/hiddenapi/sun/net/ftp/FtpClient.java @@ -31,7 +31,7 @@ import java.net.*; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class FtpClient implements java.io.Closeable { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage protected FtpClient() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/net/util/IPAddressUtil.java b/ojluni/annotations/hiddenapi/sun/net/util/IPAddressUtil.java index 710e3a895e..0134b09b6b 100644 --- a/ojluni/annotations/hiddenapi/sun/net/util/IPAddressUtil.java +++ b/ojluni/annotations/hiddenapi/sun/net/util/IPAddressUtil.java @@ -40,12 +40,12 @@ public class IPAddressUtil { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static boolean isIPv4LiteralAddress(java.lang.String src) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static boolean isIPv6LiteralAddress(java.lang.String src) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/net/www/MessageHeader.java b/ojluni/annotations/hiddenapi/sun/net/www/MessageHeader.java index c63d115128..4afd1348a5 100644 --- a/ojluni/annotations/hiddenapi/sun/net/www/MessageHeader.java +++ b/ojluni/annotations/hiddenapi/sun/net/www/MessageHeader.java @@ -35,12 +35,12 @@ import java.util.*; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class MessageHeader { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public MessageHeader() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public MessageHeader(java.io.InputStream is) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -53,7 +53,7 @@ public class MessageHeader { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public synchronized java.lang.String findValue(java.lang.String k) { throw new RuntimeException("Stub!"); } @@ -99,17 +99,17 @@ public class MessageHeader { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public synchronized void print(java.io.PrintStream p) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public synchronized void add(java.lang.String k, java.lang.String v) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public synchronized void prepend(java.lang.String k, java.lang.String v) { throw new RuntimeException("Stub!"); } @@ -126,7 +126,7 @@ public class MessageHeader { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public synchronized void set(java.lang.String k, java.lang.String v) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/net/www/ParseUtil.java b/ojluni/annotations/hiddenapi/sun/net/www/ParseUtil.java index d439a1fde1..3acc9eed6b 100644 --- a/ojluni/annotations/hiddenapi/sun/net/www/ParseUtil.java +++ b/ojluni/annotations/hiddenapi/sun/net/www/ParseUtil.java @@ -37,7 +37,7 @@ public class ParseUtil { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static java.lang.String encodePath(java.lang.String path, boolean flag) { throw new RuntimeException("Stub!"); } @@ -50,7 +50,7 @@ public class ParseUtil { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static java.lang.String decode(java.lang.String s) { throw new RuntimeException("Stub!"); } @@ -59,7 +59,7 @@ public class ParseUtil { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static java.net.URL fileToEncodedURL(java.io.File file) throws java.net.MalformedURLException { throw new RuntimeException("Stub!"); diff --git a/ojluni/annotations/hiddenapi/sun/net/www/URLConnection.java b/ojluni/annotations/hiddenapi/sun/net/www/URLConnection.java index 76692725e0..12b1d722c8 100644 --- a/ojluni/annotations/hiddenapi/sun/net/www/URLConnection.java +++ b/ojluni/annotations/hiddenapi/sun/net/www/URLConnection.java @@ -25,12 +25,10 @@ package sun.net.www; -import java.util.*; - @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class URLConnection extends java.net.URLConnection { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public URLConnection(java.net.URL u) { super(null); throw new RuntimeException("Stub!"); @@ -40,7 +38,7 @@ public abstract class URLConnection extends java.net.URLConnection { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void setProperties(sun.net.www.MessageHeader properties) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/nio/ch/DirectBuffer.java b/ojluni/annotations/hiddenapi/sun/nio/ch/DirectBuffer.java index e755c28142..87a24478ff 100644 --- a/ojluni/annotations/hiddenapi/sun/nio/ch/DirectBuffer.java +++ b/ojluni/annotations/hiddenapi/sun/nio/ch/DirectBuffer.java @@ -25,7 +25,7 @@ package sun.nio.ch; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public interface DirectBuffer { diff --git a/ojluni/annotations/hiddenapi/sun/nio/ch/FileChannelImpl.java b/ojluni/annotations/hiddenapi/sun/nio/ch/FileChannelImpl.java index ca3f145a22..7ab1dc25c9 100644 --- a/ojluni/annotations/hiddenapi/sun/nio/ch/FileChannelImpl.java +++ b/ojluni/annotations/hiddenapi/sun/nio/ch/FileChannelImpl.java @@ -207,7 +207,7 @@ public class FileChannelImpl extends java.nio.channels.FileChannel { private native long map0(int prot, long position, long length) throws java.io.IOException; - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private static native int unmap0(long address, long length); private native long transferTo0( diff --git a/ojluni/annotations/hiddenapi/sun/nio/ch/SelectorImpl.java b/ojluni/annotations/hiddenapi/sun/nio/ch/SelectorImpl.java index 294cdee0a5..41c9dd3207 100644 --- a/ojluni/annotations/hiddenapi/sun/nio/ch/SelectorImpl.java +++ b/ojluni/annotations/hiddenapi/sun/nio/ch/SelectorImpl.java @@ -94,9 +94,9 @@ public abstract class SelectorImpl extends java.nio.channels.spi.AbstractSelecto private java.util.Set<java.nio.channels.SelectionKey> publicKeys; - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private java.util.Set<java.nio.channels.SelectionKey> publicSelectedKeys; - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage protected java.util.Set<java.nio.channels.SelectionKey> selectedKeys; } diff --git a/ojluni/annotations/hiddenapi/sun/nio/cs/HistoricallyNamedCharset.java b/ojluni/annotations/hiddenapi/sun/nio/cs/HistoricallyNamedCharset.java index ed066b49e5..b0c71f4045 100644 --- a/ojluni/annotations/hiddenapi/sun/nio/cs/HistoricallyNamedCharset.java +++ b/ojluni/annotations/hiddenapi/sun/nio/cs/HistoricallyNamedCharset.java @@ -28,6 +28,6 @@ package sun.nio.cs; @SuppressWarnings({"unchecked", "deprecation", "all"}) public interface HistoricallyNamedCharset { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.String historicalName(); } diff --git a/ojluni/annotations/hiddenapi/sun/nio/cs/ThreadLocalCoders.java b/ojluni/annotations/hiddenapi/sun/nio/cs/ThreadLocalCoders.java index ef036318c9..3357f41694 100644 --- a/ojluni/annotations/hiddenapi/sun/nio/cs/ThreadLocalCoders.java +++ b/ojluni/annotations/hiddenapi/sun/nio/cs/ThreadLocalCoders.java @@ -25,8 +25,6 @@ package sun.nio.cs; -import java.nio.charset.*; - @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ThreadLocalCoders { @@ -34,7 +32,7 @@ public class ThreadLocalCoders { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static java.nio.charset.CharsetDecoder decoderFor(java.lang.Object name) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/nio/fs/BasicFileAttributesHolder.java b/ojluni/annotations/hiddenapi/sun/nio/fs/BasicFileAttributesHolder.java index 78cf143fce..3d6c0e8376 100644 --- a/ojluni/annotations/hiddenapi/sun/nio/fs/BasicFileAttributesHolder.java +++ b/ojluni/annotations/hiddenapi/sun/nio/fs/BasicFileAttributesHolder.java @@ -28,7 +28,7 @@ package sun.nio.fs; @SuppressWarnings({"unchecked", "deprecation", "all"}) public interface BasicFileAttributesHolder { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.nio.file.attribute.BasicFileAttributes get(); public void invalidate(); diff --git a/ojluni/annotations/hiddenapi/sun/reflect/Reflection.java b/ojluni/annotations/hiddenapi/sun/reflect/Reflection.java index ab0fb2a418..120ecb18ed 100644 --- a/ojluni/annotations/hiddenapi/sun/reflect/Reflection.java +++ b/ojluni/annotations/hiddenapi/sun/reflect/Reflection.java @@ -38,7 +38,7 @@ public class Reflection { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static void ensureMemberAccess( java.lang.Class<?> currentClass, java.lang.Class<?> memberClass, @@ -68,7 +68,7 @@ public class Reflection { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage static boolean isSubclassOf(java.lang.Class<?> queryClass, java.lang.Class<?> ofClass) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/reflect/misc/ReflectUtil.java b/ojluni/annotations/hiddenapi/sun/reflect/misc/ReflectUtil.java index 3200def80c..014d61300b 100644 --- a/ojluni/annotations/hiddenapi/sun/reflect/misc/ReflectUtil.java +++ b/ojluni/annotations/hiddenapi/sun/reflect/misc/ReflectUtil.java @@ -53,22 +53,22 @@ public final class ReflectUtil { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private static boolean isSubclassOf(java.lang.Class<?> queryClass, java.lang.Class<?> ofClass) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static void checkPackageAccess(java.lang.Class<?> clazz) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static void checkPackageAccess(java.lang.String name) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static boolean isPackageAccessible(java.lang.Class<?> clazz) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/action/GetBooleanAction.java b/ojluni/annotations/hiddenapi/sun/security/action/GetBooleanAction.java index 36355d7291..a9e37e463a 100644 --- a/ojluni/annotations/hiddenapi/sun/security/action/GetBooleanAction.java +++ b/ojluni/annotations/hiddenapi/sun/security/action/GetBooleanAction.java @@ -28,7 +28,7 @@ package sun.security.action; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class GetBooleanAction implements java.security.PrivilegedAction<java.lang.Boolean> { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public GetBooleanAction(java.lang.String theProp) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/action/GetIntegerAction.java b/ojluni/annotations/hiddenapi/sun/security/action/GetIntegerAction.java index a0bc736832..223563cfc3 100644 --- a/ojluni/annotations/hiddenapi/sun/security/action/GetIntegerAction.java +++ b/ojluni/annotations/hiddenapi/sun/security/action/GetIntegerAction.java @@ -32,7 +32,7 @@ public class GetIntegerAction implements java.security.PrivilegedAction<java.lan throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public GetIntegerAction(java.lang.String theProp, int defaultVal) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/action/GetPropertyAction.java b/ojluni/annotations/hiddenapi/sun/security/action/GetPropertyAction.java index b83e1cdfea..ee83f58f86 100644 --- a/ojluni/annotations/hiddenapi/sun/security/action/GetPropertyAction.java +++ b/ojluni/annotations/hiddenapi/sun/security/action/GetPropertyAction.java @@ -28,12 +28,12 @@ package sun.security.action; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class GetPropertyAction implements java.security.PrivilegedAction<java.lang.String> { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public GetPropertyAction(java.lang.String theProp) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public GetPropertyAction(java.lang.String theProp, java.lang.String defaultVal) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/jca/GetInstance.java b/ojluni/annotations/hiddenapi/sun/security/jca/GetInstance.java index e046dae3fc..92756f94c7 100644 --- a/ojluni/annotations/hiddenapi/sun/security/jca/GetInstance.java +++ b/ojluni/annotations/hiddenapi/sun/security/jca/GetInstance.java @@ -75,7 +75,7 @@ public class GetInstance { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static sun.security.jca.GetInstance.Instance getInstance( java.lang.String type, java.lang.Class<?> clazz, @@ -94,7 +94,7 @@ public class GetInstance { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static sun.security.jca.GetInstance.Instance getInstance( java.lang.String type, java.lang.Class<?> clazz, @@ -114,7 +114,7 @@ public class GetInstance { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static sun.security.jca.GetInstance.Instance getInstance( java.lang.String type, java.lang.Class<?> clazz, @@ -156,13 +156,13 @@ public class GetInstance { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage public final java.lang.Object impl; + @android.compat.annotation.UnsupportedAppUsage public final java.lang.Object impl; { impl = null; } - @dalvik.annotation.compat.UnsupportedAppUsage public final java.security.Provider provider; + @android.compat.annotation.UnsupportedAppUsage public final java.security.Provider provider; { provider = null; diff --git a/ojluni/annotations/hiddenapi/sun/security/jca/JCAUtil.java b/ojluni/annotations/hiddenapi/sun/security/jca/JCAUtil.java index 26d767f316..ca703f284c 100644 --- a/ojluni/annotations/hiddenapi/sun/security/jca/JCAUtil.java +++ b/ojluni/annotations/hiddenapi/sun/security/jca/JCAUtil.java @@ -39,7 +39,7 @@ public final class JCAUtil { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static java.security.SecureRandom getSecureRandom() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/jca/ProviderConfig.java b/ojluni/annotations/hiddenapi/sun/security/jca/ProviderConfig.java index 60ed61eeb7..f6abd8bbaf 100644 --- a/ojluni/annotations/hiddenapi/sun/security/jca/ProviderConfig.java +++ b/ojluni/annotations/hiddenapi/sun/security/jca/ProviderConfig.java @@ -47,7 +47,7 @@ final class ProviderConfig { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private boolean hasArgument() { throw new RuntimeException("Stub!"); } @@ -56,7 +56,7 @@ final class ProviderConfig { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private void disableLoad() { throw new RuntimeException("Stub!"); } @@ -94,7 +94,7 @@ final class ProviderConfig { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage private static final java.lang.Class[] CL_STRING; + @android.compat.annotation.UnsupportedAppUsage private static final java.lang.Class[] CL_STRING; static { CL_STRING = new java.lang.Class[0]; @@ -107,7 +107,7 @@ final class ProviderConfig { private static final java.lang.String P11_SOL_NAME = "sun.security.pkcs11.SunPKCS11"; - @dalvik.annotation.compat.UnsupportedAppUsage private final java.lang.String argument; + @android.compat.annotation.UnsupportedAppUsage private final java.lang.String argument; { argument = null; diff --git a/ojluni/annotations/hiddenapi/sun/security/jca/ProviderList.java b/ojluni/annotations/hiddenapi/sun/security/jca/ProviderList.java index 7cd3d4e9e8..e823f31706 100644 --- a/ojluni/annotations/hiddenapi/sun/security/jca/ProviderList.java +++ b/ojluni/annotations/hiddenapi/sun/security/jca/ProviderList.java @@ -106,7 +106,7 @@ public final class ProviderList { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.security.Provider.Service getService(java.lang.String type, java.lang.String name) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/jca/Providers.java b/ojluni/annotations/hiddenapi/sun/security/jca/Providers.java index da37d94dd5..4e116fc88f 100644 --- a/ojluni/annotations/hiddenapi/sun/security/jca/Providers.java +++ b/ojluni/annotations/hiddenapi/sun/security/jca/Providers.java @@ -38,17 +38,17 @@ public class Providers { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static java.lang.Object startJarVerification() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static void stopJarVerification(java.lang.Object obj) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static sun.security.jca.ProviderList getProviderList() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/pkcs/ContentInfo.java b/ojluni/annotations/hiddenapi/sun/security/pkcs/ContentInfo.java index 98a0a8506e..4340ab510e 100644 --- a/ojluni/annotations/hiddenapi/sun/security/pkcs/ContentInfo.java +++ b/ojluni/annotations/hiddenapi/sun/security/pkcs/ContentInfo.java @@ -31,13 +31,13 @@ import sun.security.util.*; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ContentInfo { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public ContentInfo( sun.security.util.ObjectIdentifier contentType, sun.security.util.DerValue content) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public ContentInfo(byte[] bytes) { throw new RuntimeException("Stub!"); } @@ -60,12 +60,12 @@ public class ContentInfo { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] getData() throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void encode(sun.security.util.DerOutputStream out) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -78,7 +78,7 @@ public class ContentInfo { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static sun.security.util.ObjectIdentifier DATA_OID; public static sun.security.util.ObjectIdentifier DIGESTED_DATA_OID; diff --git a/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS7.java b/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS7.java index 029282789c..48a4c3ce44 100644 --- a/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS7.java +++ b/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS7.java @@ -44,12 +44,12 @@ public class PKCS7 { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public PKCS7(byte[] bytes) throws sun.security.pkcs.ParsingException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public PKCS7( sun.security.x509.AlgorithmId[] digestAlgorithmIds, sun.security.pkcs.ContentInfo contentInfo, @@ -59,7 +59,7 @@ public class PKCS7 { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public PKCS7( sun.security.x509.AlgorithmId[] digestAlgorithmIds, sun.security.pkcs.ContentInfo contentInfo, @@ -93,7 +93,7 @@ public class PKCS7 { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void encodeSignedData(java.io.OutputStream out) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -102,7 +102,7 @@ public class PKCS7 { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.pkcs.SignerInfo verify(sun.security.pkcs.SignerInfo info, byte[] bytes) throws java.security.NoSuchAlgorithmException, java.security.SignatureException { throw new RuntimeException("Stub!"); @@ -115,7 +115,7 @@ public class PKCS7 { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.pkcs.SignerInfo[] verify(byte[] bytes) throws java.security.NoSuchAlgorithmException, java.security.SignatureException { throw new RuntimeException("Stub!"); @@ -134,12 +134,12 @@ public class PKCS7 { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.pkcs.ContentInfo getContentInfo() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.security.cert.X509Certificate[] getCertificates() { throw new RuntimeException("Stub!"); } @@ -148,7 +148,7 @@ public class PKCS7 { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.pkcs.SignerInfo[] getSignerInfos() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS8Key.java b/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS8Key.java index fa84ed9454..e8bb5a11c4 100644 --- a/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS8Key.java +++ b/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS8Key.java @@ -32,7 +32,7 @@ import sun.security.x509.*; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class PKCS8Key implements java.security.PrivateKey { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public PKCS8Key() { throw new RuntimeException("Stub!"); } @@ -115,11 +115,11 @@ public class PKCS8Key implements java.security.PrivateKey { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage protected sun.security.x509.AlgorithmId algid; + @android.compat.annotation.UnsupportedAppUsage protected sun.security.x509.AlgorithmId algid; - @dalvik.annotation.compat.UnsupportedAppUsage protected byte[] encodedKey; + @android.compat.annotation.UnsupportedAppUsage protected byte[] encodedKey; - @dalvik.annotation.compat.UnsupportedAppUsage protected byte[] key; + @android.compat.annotation.UnsupportedAppUsage protected byte[] key; private static final long serialVersionUID = -3836890099307167124L; // 0xcac0a0c88c95426cL diff --git a/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS9Attribute.java b/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS9Attribute.java index 40718c2f18..4413f4e192 100644 --- a/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS9Attribute.java +++ b/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS9Attribute.java @@ -29,19 +29,19 @@ package sun.security.pkcs; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class PKCS9Attribute implements sun.security.util.DerEncoder { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public PKCS9Attribute(sun.security.util.ObjectIdentifier oid, java.lang.Object value) throws java.lang.IllegalArgumentException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public PKCS9Attribute(java.lang.String name, java.lang.Object value) throws java.lang.IllegalArgumentException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public PKCS9Attribute(sun.security.util.DerValue derVal) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -51,7 +51,7 @@ public class PKCS9Attribute implements sun.security.util.DerEncoder { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void derEncode(java.io.OutputStream out) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -60,7 +60,7 @@ public class PKCS9Attribute implements sun.security.util.DerEncoder { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.Object getValue() { throw new RuntimeException("Stub!"); } @@ -69,7 +69,7 @@ public class PKCS9Attribute implements sun.security.util.DerEncoder { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.util.ObjectIdentifier getOID() { throw new RuntimeException("Stub!"); } @@ -116,7 +116,7 @@ public class PKCS9Attribute implements sun.security.util.DerEncoder { public static final java.lang.String CHALLENGE_PASSWORD_STR = "ChallengePassword"; - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier CONTENT_TYPE_OID; static { @@ -133,7 +133,7 @@ public class PKCS9Attribute implements sun.security.util.DerEncoder { public static final java.lang.String COUNTERSIGNATURE_STR = "Countersignature"; - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier EMAIL_ADDRESS_OID; static { @@ -167,7 +167,7 @@ public class PKCS9Attribute implements sun.security.util.DerEncoder { public static final java.lang.String ISSUER_SERIALNUMBER_STR = "IssuerAndSerialNumber"; - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier MESSAGE_DIGEST_OID; static { @@ -220,7 +220,7 @@ public class PKCS9Attribute implements sun.security.util.DerEncoder { public static final java.lang.String SIGNING_CERTIFICATE_STR = "SigningCertificate"; - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier SIGNING_TIME_OID; static { diff --git a/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS9Attributes.java b/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS9Attributes.java index ac9fabaed3..a5e9019936 100644 --- a/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS9Attributes.java +++ b/ojluni/annotations/hiddenapi/sun/security/pkcs/PKCS9Attributes.java @@ -36,18 +36,18 @@ public class PKCS9Attributes { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public PKCS9Attributes(sun.security.util.DerInputStream in) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public PKCS9Attributes(sun.security.util.DerInputStream in, boolean ignoreUnsupportedAttributes) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public PKCS9Attributes(sun.security.pkcs.PKCS9Attribute[] attribs) throws java.io.IOException, java.lang.IllegalArgumentException { throw new RuntimeException("Stub!"); @@ -57,7 +57,7 @@ public class PKCS9Attributes { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void encode(byte tag, java.io.OutputStream out) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -66,7 +66,7 @@ public class PKCS9Attributes { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] getDerEncoding() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -75,7 +75,7 @@ public class PKCS9Attributes { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.pkcs.PKCS9Attribute getAttribute(java.lang.String name) { throw new RuntimeException("Stub!"); } @@ -84,7 +84,7 @@ public class PKCS9Attributes { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.Object getAttributeValue(sun.security.util.ObjectIdentifier oid) throws java.io.IOException { throw new RuntimeException("Stub!"); diff --git a/ojluni/annotations/hiddenapi/sun/security/pkcs/ParsingException.java b/ojluni/annotations/hiddenapi/sun/security/pkcs/ParsingException.java index 7b101157c1..1f012cb930 100644 --- a/ojluni/annotations/hiddenapi/sun/security/pkcs/ParsingException.java +++ b/ojluni/annotations/hiddenapi/sun/security/pkcs/ParsingException.java @@ -37,7 +37,7 @@ public class ParsingException extends java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public ParsingException(java.lang.String s) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/pkcs/SignerInfo.java b/ojluni/annotations/hiddenapi/sun/security/pkcs/SignerInfo.java index 03ebf6fc7e..162b4209ea 100644 --- a/ojluni/annotations/hiddenapi/sun/security/pkcs/SignerInfo.java +++ b/ojluni/annotations/hiddenapi/sun/security/pkcs/SignerInfo.java @@ -34,7 +34,7 @@ public class SignerInfo implements sun.security.util.DerEncoder { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public SignerInfo( sun.security.x509.X500Name issuerName, java.math.BigInteger serial, @@ -44,7 +44,7 @@ public class SignerInfo implements sun.security.util.DerEncoder { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public SignerInfo( sun.security.x509.X500Name issuerName, java.math.BigInteger serial, @@ -74,13 +74,13 @@ public class SignerInfo implements sun.security.util.DerEncoder { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.security.cert.X509Certificate getCertificate(sun.security.pkcs.PKCS7 block) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.util.ArrayList<java.security.cert.X509Certificate> getCertificateChain( sun.security.pkcs.PKCS7 block) throws java.io.IOException { throw new RuntimeException("Stub!"); @@ -115,7 +115,7 @@ public class SignerInfo implements sun.security.util.DerEncoder { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.x509.AlgorithmId getDigestAlgorithmId() { throw new RuntimeException("Stub!"); } @@ -124,12 +124,12 @@ public class SignerInfo implements sun.security.util.DerEncoder { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.x509.AlgorithmId getDigestEncryptionAlgorithmId() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] getEncryptedDigest() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/provider/X509Factory.java b/ojluni/annotations/hiddenapi/sun/security/provider/X509Factory.java index 499dddc810..5f2376510a 100644 --- a/ojluni/annotations/hiddenapi/sun/security/provider/X509Factory.java +++ b/ojluni/annotations/hiddenapi/sun/security/provider/X509Factory.java @@ -25,8 +25,6 @@ package sun.security.provider; -import java.security.cert.*; - @SuppressWarnings({"unchecked", "deprecation", "all"}) public class X509Factory { @@ -34,25 +32,25 @@ public class X509Factory { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static synchronized sun.security.x509.X509CertImpl intern( java.security.cert.X509Certificate c) throws java.security.cert.CertificateException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static synchronized sun.security.x509.X509CRLImpl intern(java.security.cert.X509CRL c) throws java.security.cert.CRLException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private static synchronized <K, V> V getFromCache( sun.security.util.Cache<K, V> cache, byte[] encoding) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private static synchronized <V> void addToCache( sun.security.util.Cache<java.lang.Object, V> cache, byte[] encoding, V value) { throw new RuntimeException("Stub!"); @@ -60,7 +58,7 @@ public class X509Factory { private static final int ENC_MAX_LENGTH = 4194304; // 0x400000 - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private static final sun.security.util.Cache<java.lang.Object, sun.security.x509.X509CertImpl> certCache; @@ -68,7 +66,7 @@ public class X509Factory { certCache = null; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private static final sun.security.util.Cache<java.lang.Object, sun.security.x509.X509CRLImpl> crlCache; diff --git a/ojluni/annotations/hiddenapi/sun/security/provider/certpath/X509CertPath.java b/ojluni/annotations/hiddenapi/sun/security/provider/certpath/X509CertPath.java index f3d432a644..71cc57f1c2 100644 --- a/ojluni/annotations/hiddenapi/sun/security/provider/certpath/X509CertPath.java +++ b/ojluni/annotations/hiddenapi/sun/security/provider/certpath/X509CertPath.java @@ -25,25 +25,23 @@ package sun.security.provider.certpath; -import java.util.*; - @SuppressWarnings({"unchecked", "deprecation", "all"}) public class X509CertPath extends java.security.cert.CertPath { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X509CertPath(java.util.List<? extends java.security.cert.Certificate> certs) throws java.security.cert.CertificateException { super(null); throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X509CertPath(java.io.InputStream is) throws java.security.cert.CertificateException { super(null); throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X509CertPath(java.io.InputStream is, java.lang.String encoding) throws java.security.cert.CertificateException { super(null); @@ -81,7 +79,7 @@ public class X509CertPath extends java.security.cert.CertPath { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static java.util.Iterator<java.lang.String> getEncodingsStatic() { throw new RuntimeException("Stub!"); } @@ -100,7 +98,7 @@ public class X509CertPath extends java.security.cert.CertPath { private static final java.lang.String PKIPATH_ENCODING = "PkiPath"; - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private java.util.List<java.security.cert.X509Certificate> certs; private static final java.util.Collection<java.lang.String> encodingList; diff --git a/ojluni/annotations/hiddenapi/sun/security/provider/certpath/X509CertificatePair.java b/ojluni/annotations/hiddenapi/sun/security/provider/certpath/X509CertificatePair.java index 3d5b41064a..fa9fb60410 100644 --- a/ojluni/annotations/hiddenapi/sun/security/provider/certpath/X509CertificatePair.java +++ b/ojluni/annotations/hiddenapi/sun/security/provider/certpath/X509CertificatePair.java @@ -43,7 +43,7 @@ public class X509CertificatePair { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static synchronized void clearCache() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/timestamp/TimestampToken.java b/ojluni/annotations/hiddenapi/sun/security/timestamp/TimestampToken.java index 241935ef65..1c2d11595b 100644 --- a/ojluni/annotations/hiddenapi/sun/security/timestamp/TimestampToken.java +++ b/ojluni/annotations/hiddenapi/sun/security/timestamp/TimestampToken.java @@ -28,27 +28,27 @@ package sun.security.timestamp; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class TimestampToken { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public TimestampToken(byte[] timestampTokenInfo) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.util.Date getDate() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.x509.AlgorithmId getHashAlgorithm() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] getHashedMessage() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.math.BigInteger getNonce() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/util/BitArray.java b/ojluni/annotations/hiddenapi/sun/security/util/BitArray.java index 2eb98fe5ab..a27ab6540a 100644 --- a/ojluni/annotations/hiddenapi/sun/security/util/BitArray.java +++ b/ojluni/annotations/hiddenapi/sun/security/util/BitArray.java @@ -32,7 +32,7 @@ public class BitArray { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public BitArray(int length, byte[] a) throws java.lang.IllegalArgumentException { throw new RuntimeException("Stub!"); } @@ -65,7 +65,7 @@ public class BitArray { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] toByteArray() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/util/Cache.java b/ojluni/annotations/hiddenapi/sun/security/util/Cache.java index f5077e1f1b..1520e12cc1 100644 --- a/ojluni/annotations/hiddenapi/sun/security/util/Cache.java +++ b/ojluni/annotations/hiddenapi/sun/security/util/Cache.java @@ -31,20 +31,20 @@ import java.util.*; @SuppressWarnings({"unchecked", "deprecation", "all"}) public abstract class Cache<K, V> { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage protected Cache() { throw new RuntimeException("Stub!"); } public abstract int size(); - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public abstract void clear(); - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public abstract void put(K key, V value); - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public abstract V get(java.lang.Object key); public abstract void remove(java.lang.Object key); @@ -63,7 +63,7 @@ public abstract class Cache<K, V> { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static <K, V> sun.security.util.Cache<K, V> newHardMemoryCache(int size) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/util/Debug.java b/ojluni/annotations/hiddenapi/sun/security/util/Debug.java index e511d0d589..5421d20a51 100644 --- a/ojluni/annotations/hiddenapi/sun/security/util/Debug.java +++ b/ojluni/annotations/hiddenapi/sun/security/util/Debug.java @@ -33,7 +33,7 @@ public class Debug { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static sun.security.util.Debug getInstance(java.lang.String option) { throw new RuntimeException("Stub!"); } @@ -47,17 +47,17 @@ public class Debug { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void println(java.lang.String message) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void println() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static java.lang.String toHexString(java.math.BigInteger b) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/util/DerIndefLenConverter.java b/ojluni/annotations/hiddenapi/sun/security/util/DerIndefLenConverter.java index af6e282901..6ac25a92fc 100644 --- a/ojluni/annotations/hiddenapi/sun/security/util/DerIndefLenConverter.java +++ b/ojluni/annotations/hiddenapi/sun/security/util/DerIndefLenConverter.java @@ -29,7 +29,7 @@ package sun.security.util; @SuppressWarnings({"unchecked", "deprecation", "all"}) class DerIndefLenConverter { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage DerIndefLenConverter() { throw new RuntimeException("Stub!"); } @@ -42,27 +42,27 @@ class DerIndefLenConverter { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage static boolean isIndefinite(int lengthByte) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private void parseTag() throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private void writeTag() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private int parseLength() throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private void writeLengthAndValue() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -79,7 +79,7 @@ class DerIndefLenConverter { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private void parseValue(int curLen) { throw new RuntimeException("Stub!"); } @@ -88,7 +88,7 @@ class DerIndefLenConverter { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage byte[] convert(byte[] indefData) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -105,21 +105,21 @@ class DerIndefLenConverter { private static final int TAG_MASK = 31; // 0x1f - @dalvik.annotation.compat.UnsupportedAppUsage private byte[] data; + @android.compat.annotation.UnsupportedAppUsage private byte[] data; - @dalvik.annotation.compat.UnsupportedAppUsage private int dataPos; + @android.compat.annotation.UnsupportedAppUsage private int dataPos; - @dalvik.annotation.compat.UnsupportedAppUsage private int dataSize; + @android.compat.annotation.UnsupportedAppUsage private int dataSize; private int index; private java.util.ArrayList<java.lang.Object> ndefsList; - @dalvik.annotation.compat.UnsupportedAppUsage private byte[] newData; + @android.compat.annotation.UnsupportedAppUsage private byte[] newData; private int newDataPos; - @dalvik.annotation.compat.UnsupportedAppUsage private int numOfTotalLenBytes = 0; // 0x0 + @android.compat.annotation.UnsupportedAppUsage private int numOfTotalLenBytes = 0; // 0x0 private int unresolved = 0; // 0x0 } diff --git a/ojluni/annotations/hiddenapi/sun/security/util/DerInputStream.java b/ojluni/annotations/hiddenapi/sun/security/util/DerInputStream.java index a8348e32f1..fefcd08451 100644 --- a/ojluni/annotations/hiddenapi/sun/security/util/DerInputStream.java +++ b/ojluni/annotations/hiddenapi/sun/security/util/DerInputStream.java @@ -29,7 +29,7 @@ package sun.security.util; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class DerInputStream { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public DerInputStream(byte[] data) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -52,7 +52,7 @@ public class DerInputStream { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.util.DerInputStream subStream(int len, boolean do_skip) throws java.io.IOException { throw new RuntimeException("Stub!"); @@ -62,12 +62,12 @@ public class DerInputStream { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public int getInteger() throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.math.BigInteger getBigInteger() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -80,7 +80,7 @@ public class DerInputStream { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] getBitString() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -89,7 +89,7 @@ public class DerInputStream { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] getOctetString() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -102,7 +102,7 @@ public class DerInputStream { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.util.ObjectIdentifier getOID() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -112,17 +112,17 @@ public class DerInputStream { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.util.DerValue[] getSequence(int startLen) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.util.DerValue[] getSet(int startLen) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.util.DerValue[] getSet(int startLen, boolean implicit) throws java.io.IOException { throw new RuntimeException("Stub!"); @@ -143,12 +143,12 @@ public class DerInputStream { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.util.DerValue getDerValue() throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.String getUTF8String() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -179,7 +179,7 @@ public class DerInputStream { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.util.Date getUTCTime() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -192,7 +192,7 @@ public class DerInputStream { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public int peekByte() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -209,22 +209,22 @@ public class DerInputStream { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void mark(int value) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void reset() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public int available() { throw new RuntimeException("Stub!"); } sun.security.util.DerInputBuffer buffer; - @dalvik.annotation.compat.UnsupportedAppUsage public byte tag; + @android.compat.annotation.UnsupportedAppUsage public byte tag; } diff --git a/ojluni/annotations/hiddenapi/sun/security/util/DerOutputStream.java b/ojluni/annotations/hiddenapi/sun/security/util/DerOutputStream.java index 77e5e05c78..772018d09c 100644 --- a/ojluni/annotations/hiddenapi/sun/security/util/DerOutputStream.java +++ b/ojluni/annotations/hiddenapi/sun/security/util/DerOutputStream.java @@ -30,22 +30,22 @@ package sun.security.util; public class DerOutputStream extends java.io.ByteArrayOutputStream implements sun.security.util.DerEncoder { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public DerOutputStream(int size) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public DerOutputStream() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void write(byte tag, byte[] buf) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void write(byte tag, sun.security.util.DerOutputStream out) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -55,12 +55,12 @@ public class DerOutputStream extends java.io.ByteArrayOutputStream throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void putDerValue(sun.security.util.DerValue val) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void putBoolean(boolean val) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -69,7 +69,7 @@ public class DerOutputStream extends java.io.ByteArrayOutputStream throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void putInteger(java.math.BigInteger i) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -78,7 +78,7 @@ public class DerOutputStream extends java.io.ByteArrayOutputStream throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void putInteger(int i) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -87,7 +87,7 @@ public class DerOutputStream extends java.io.ByteArrayOutputStream throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void putBitString(byte[] bits) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -101,22 +101,22 @@ public class DerOutputStream extends java.io.ByteArrayOutputStream throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void putOctetString(byte[] octets) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void putNull() throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void putOID(sun.security.util.ObjectIdentifier oid) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void putSequence(sun.security.util.DerValue[] seq) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -125,7 +125,7 @@ public class DerOutputStream extends java.io.ByteArrayOutputStream throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void putOrderedSetOf(byte tag, sun.security.util.DerEncoder[] set) throws java.io.IOException { throw new RuntimeException("Stub!"); @@ -142,12 +142,12 @@ public class DerOutputStream extends java.io.ByteArrayOutputStream throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void putUTF8String(java.lang.String s) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void putPrintableString(java.lang.String s) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -156,7 +156,7 @@ public class DerOutputStream extends java.io.ByteArrayOutputStream throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void putIA5String(java.lang.String s) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -174,7 +174,7 @@ public class DerOutputStream extends java.io.ByteArrayOutputStream throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void putUTCTime(java.util.Date d) throws java.io.IOException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/util/DerValue.java b/ojluni/annotations/hiddenapi/sun/security/util/DerValue.java index d034f44a90..42825d3ed3 100644 --- a/ojluni/annotations/hiddenapi/sun/security/util/DerValue.java +++ b/ojluni/annotations/hiddenapi/sun/security/util/DerValue.java @@ -30,7 +30,7 @@ import java.io.*; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class DerValue { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public DerValue(java.lang.String value) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -39,7 +39,7 @@ public class DerValue { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public DerValue(byte tag, byte[] data) { throw new RuntimeException("Stub!"); } @@ -49,17 +49,17 @@ public class DerValue { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public DerValue(byte[] buf) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public DerValue(byte[] buf, int offset, int len) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public DerValue(java.io.InputStream in) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -72,12 +72,12 @@ public class DerValue { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public boolean isContextSpecific() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public boolean isContextSpecific(byte cntxtTag) { throw new RuntimeException("Stub!"); } @@ -86,7 +86,7 @@ public class DerValue { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public boolean isConstructed() { throw new RuntimeException("Stub!"); } @@ -105,12 +105,12 @@ public class DerValue { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void encode(sun.security.util.DerOutputStream out) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public final sun.security.util.DerInputStream getData() { throw new RuntimeException("Stub!"); } @@ -123,7 +123,7 @@ public class DerValue { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.util.ObjectIdentifier getOID() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -132,7 +132,7 @@ public class DerValue { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] getOctetString() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -141,12 +141,12 @@ public class DerValue { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.math.BigInteger getBigInteger() throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.math.BigInteger getPositiveBigInteger() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -155,17 +155,17 @@ public class DerValue { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] getBitString() throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.util.BitArray getUnalignedBitString() throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.String getAsString() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -179,7 +179,7 @@ public class DerValue { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] getDataBytes() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -236,12 +236,12 @@ public class DerValue { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] toByteArray() throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.util.DerInputStream toDerInputStream() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -250,17 +250,17 @@ public class DerValue { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static boolean isPrintableStringChar(char ch) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static byte createTag(byte tagClass, boolean form, byte val) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void resetTag(byte tag) { throw new RuntimeException("Stub!"); } @@ -277,9 +277,9 @@ public class DerValue { public static final byte TAG_UNIVERSAL = 0; // 0x0 - @dalvik.annotation.compat.UnsupportedAppUsage protected sun.security.util.DerInputBuffer buffer; + @android.compat.annotation.UnsupportedAppUsage protected sun.security.util.DerInputBuffer buffer; - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public final sun.security.util.DerInputStream data; { @@ -290,7 +290,7 @@ public class DerValue { private byte[] originalEncodedForm; - @dalvik.annotation.compat.UnsupportedAppUsage public byte tag; + @android.compat.annotation.UnsupportedAppUsage public byte tag; public static final byte tag_BMPString = 30; // 0x1e diff --git a/ojluni/annotations/hiddenapi/sun/security/util/ManifestDigester.java b/ojluni/annotations/hiddenapi/sun/security/util/ManifestDigester.java index ff473fb141..b8d89f8bd7 100644 --- a/ojluni/annotations/hiddenapi/sun/security/util/ManifestDigester.java +++ b/ojluni/annotations/hiddenapi/sun/security/util/ManifestDigester.java @@ -30,7 +30,7 @@ import java.security.*; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class ManifestDigester { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public ManifestDigester(byte[] bytes) { throw new RuntimeException("Stub!"); } @@ -43,12 +43,12 @@ public class ManifestDigester { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.util.ManifestDigester.Entry get(java.lang.String name, boolean oldStyle) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] manifestDigest(java.security.MessageDigest md) { throw new RuntimeException("Stub!"); } @@ -66,7 +66,7 @@ public class ManifestDigester { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] digest(java.security.MessageDigest md) { throw new RuntimeException("Stub!"); } @@ -76,7 +76,7 @@ public class ManifestDigester { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] digestWorkaround(java.security.MessageDigest md) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/util/MemoryCache.java b/ojluni/annotations/hiddenapi/sun/security/util/MemoryCache.java index 0bea0a2017..5a7d646e15 100644 --- a/ojluni/annotations/hiddenapi/sun/security/util/MemoryCache.java +++ b/ojluni/annotations/hiddenapi/sun/security/util/MemoryCache.java @@ -16,7 +16,7 @@ package sun.security.util; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) class MemoryCache<K, V> extends sun.security.util.Cache<K, V> { diff --git a/ojluni/annotations/hiddenapi/sun/security/util/ObjectIdentifier.java b/ojluni/annotations/hiddenapi/sun/security/util/ObjectIdentifier.java index 1c17bed56e..7b536f470f 100644 --- a/ojluni/annotations/hiddenapi/sun/security/util/ObjectIdentifier.java +++ b/ojluni/annotations/hiddenapi/sun/security/util/ObjectIdentifier.java @@ -30,12 +30,12 @@ import java.io.*; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class ObjectIdentifier implements java.io.Serializable { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public ObjectIdentifier(java.lang.String oid) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public ObjectIdentifier(int[] values) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -61,7 +61,7 @@ public final class ObjectIdentifier implements java.io.Serializable { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static sun.security.util.ObjectIdentifier newInternal(int[] values) { throw new RuntimeException("Stub!"); } @@ -71,7 +71,7 @@ public final class ObjectIdentifier implements java.io.Serializable { } @Deprecated - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public boolean equals(sun.security.util.ObjectIdentifier other) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/util/PropertyExpander.java b/ojluni/annotations/hiddenapi/sun/security/util/PropertyExpander.java index f763de7d0b..9a86630c92 100644 --- a/ojluni/annotations/hiddenapi/sun/security/util/PropertyExpander.java +++ b/ojluni/annotations/hiddenapi/sun/security/util/PropertyExpander.java @@ -33,7 +33,7 @@ public class PropertyExpander { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static java.lang.String expand(java.lang.String value) throws sun.security.util.PropertyExpander.ExpandException { throw new RuntimeException("Stub!"); diff --git a/ojluni/annotations/hiddenapi/sun/security/util/ResourcesMgr.java b/ojluni/annotations/hiddenapi/sun/security/util/ResourcesMgr.java index eef01dc330..0a66caebc2 100644 --- a/ojluni/annotations/hiddenapi/sun/security/util/ResourcesMgr.java +++ b/ojluni/annotations/hiddenapi/sun/security/util/ResourcesMgr.java @@ -32,7 +32,7 @@ public class ResourcesMgr { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static java.lang.String getString(java.lang.String s) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/util/SecurityConstants.java b/ojluni/annotations/hiddenapi/sun/security/util/SecurityConstants.java index 33d67c63b0..4a89da6384 100644 --- a/ojluni/annotations/hiddenapi/sun/security/util/SecurityConstants.java +++ b/ojluni/annotations/hiddenapi/sun/security/util/SecurityConstants.java @@ -51,7 +51,7 @@ public final class SecurityConstants { CREATE_ACC_PERMISSION = null; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final java.lang.RuntimePermission CREATE_CLASSLOADER_PERMISSION; static { @@ -68,7 +68,7 @@ public final class SecurityConstants { public static final java.lang.String FILE_WRITE_ACTION = "write"; - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final java.lang.RuntimePermission GET_CLASSLOADER_PERMISSION; static { @@ -123,14 +123,14 @@ public final class SecurityConstants { LOCAL_LISTEN_PERMISSION = null; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final java.lang.RuntimePermission MODIFY_THREADGROUP_PERMISSION; static { MODIFY_THREADGROUP_PERMISSION = null; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final java.lang.RuntimePermission MODIFY_THREAD_PERMISSION; static { diff --git a/ojluni/annotations/hiddenapi/sun/security/util/SignatureFileVerifier.java b/ojluni/annotations/hiddenapi/sun/security/util/SignatureFileVerifier.java index bce34ad2b9..0d9c77092a 100644 --- a/ojluni/annotations/hiddenapi/sun/security/util/SignatureFileVerifier.java +++ b/ojluni/annotations/hiddenapi/sun/security/util/SignatureFileVerifier.java @@ -50,7 +50,7 @@ public class SignatureFileVerifier { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static boolean isBlockOrSF(java.lang.String s) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/AVA.java b/ojluni/annotations/hiddenapi/sun/security/x509/AVA.java index e2e18ca09e..d4018bfae3 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/AVA.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/AVA.java @@ -26,7 +26,7 @@ package sun.security.x509; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class AVA implements sun.security.util.DerEncoder { diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/AVAComparator.java b/ojluni/annotations/hiddenapi/sun/security/x509/AVAComparator.java index 21494c3199..3643d60bd0 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/AVAComparator.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/AVAComparator.java @@ -16,7 +16,7 @@ package sun.security.x509; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) class AVAComparator implements java.util.Comparator<sun.security.x509.AVA> { diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/AVAKeyword.java b/ojluni/annotations/hiddenapi/sun/security/x509/AVAKeyword.java index 78d379f9e8..adadd59138 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/AVAKeyword.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/AVAKeyword.java @@ -17,7 +17,7 @@ package sun.security.x509; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) class AVAKeyword { diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/AccessDescription.java b/ojluni/annotations/hiddenapi/sun/security/x509/AccessDescription.java index 5f3d77fe04..d6f5e1d4b9 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/AccessDescription.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/AccessDescription.java @@ -36,17 +36,17 @@ public final class AccessDescription { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public AccessDescription(sun.security.util.DerValue derValue) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.util.ObjectIdentifier getAccessMethod() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.x509.GeneralName getAccessLocation() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/AlgorithmId.java b/ojluni/annotations/hiddenapi/sun/security/x509/AlgorithmId.java index 3f9214b274..7948de8bb6 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/AlgorithmId.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/AlgorithmId.java @@ -26,7 +26,7 @@ package sun.security.x509; -import dalvik.annotation.compat.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class AlgorithmId implements java.io.Serializable, sun.security.util.DerEncoder { diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/AttributeNameEnumeration.java b/ojluni/annotations/hiddenapi/sun/security/x509/AttributeNameEnumeration.java index c3728d7a1f..6bda58ed6d 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/AttributeNameEnumeration.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/AttributeNameEnumeration.java @@ -29,7 +29,7 @@ package sun.security.x509; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class AttributeNameEnumeration extends java.util.Vector<java.lang.String> { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public AttributeNameEnumeration() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/CRLDistributionPointsExtension.java b/ojluni/annotations/hiddenapi/sun/security/x509/CRLDistributionPointsExtension.java index 84063ed77e..2e8439f88a 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/CRLDistributionPointsExtension.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/CRLDistributionPointsExtension.java @@ -100,7 +100,7 @@ public class CRLDistributionPointsExtension extends sun.security.x509.Extension throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private void encodeThis() throws java.io.IOException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/CRLNumberExtension.java b/ojluni/annotations/hiddenapi/sun/security/x509/CRLNumberExtension.java index 00d0ee00fc..40eb1b8afd 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/CRLNumberExtension.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/CRLNumberExtension.java @@ -49,7 +49,7 @@ public class CRLNumberExtension extends sun.security.x509.Extension throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public CRLNumberExtension(java.lang.Boolean critical, java.lang.Object value) throws java.io.IOException { throw new RuntimeException("Stub!"); @@ -65,7 +65,7 @@ public class CRLNumberExtension extends sun.security.x509.Extension throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private void encodeThis() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -74,7 +74,7 @@ public class CRLNumberExtension extends sun.security.x509.Extension throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.math.BigInteger get(java.lang.String name) throws java.io.IOException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateAlgorithmId.java b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateAlgorithmId.java index 5a3bc38d07..4a8f963d33 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateAlgorithmId.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateAlgorithmId.java @@ -30,7 +30,7 @@ import sun.security.util.*; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class CertificateAlgorithmId implements sun.security.x509.CertAttrSet<java.lang.String> { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public CertificateAlgorithmId(sun.security.x509.AlgorithmId algId) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateExtensions.java b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateExtensions.java index cad6f74ab4..da41fbded9 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateExtensions.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateExtensions.java @@ -32,12 +32,12 @@ import sun.security.util.*; public class CertificateExtensions implements sun.security.x509.CertAttrSet<sun.security.x509.Extension> { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public CertificateExtensions() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public CertificateExtensions(sun.security.util.DerInputStream in) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -55,18 +55,18 @@ public class CertificateExtensions throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void encode(java.io.OutputStream out, boolean isCertReq) throws java.security.cert.CertificateException, java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void set(java.lang.String name, java.lang.Object obj) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.x509.Extension get(java.lang.String name) throws java.io.IOException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateIssuerName.java b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateIssuerName.java index 22380db47c..c6736ff76c 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateIssuerName.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateIssuerName.java @@ -30,7 +30,7 @@ import sun.security.util.*; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class CertificateIssuerName implements sun.security.x509.CertAttrSet<java.lang.String> { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public CertificateIssuerName(sun.security.x509.X500Name name) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateSerialNumber.java b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateSerialNumber.java index 131b445576..1a0cb8109b 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateSerialNumber.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateSerialNumber.java @@ -30,12 +30,12 @@ import sun.security.util.*; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class CertificateSerialNumber implements sun.security.x509.CertAttrSet<java.lang.String> { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public CertificateSerialNumber(java.math.BigInteger num) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public CertificateSerialNumber(int num) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateSubjectName.java b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateSubjectName.java index f5ff91086c..87842cae19 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateSubjectName.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateSubjectName.java @@ -30,7 +30,7 @@ import sun.security.util.*; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class CertificateSubjectName implements sun.security.x509.CertAttrSet<java.lang.String> { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public CertificateSubjectName(sun.security.x509.X500Name name) { throw new RuntimeException("Stub!"); } @@ -55,7 +55,7 @@ public class CertificateSubjectName implements sun.security.x509.CertAttrSet<jav throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.Object get(java.lang.String name) throws java.io.IOException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateValidity.java b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateValidity.java index bb5d59980d..db96a7af73 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateValidity.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateValidity.java @@ -35,7 +35,7 @@ public class CertificateValidity implements sun.security.x509.CertAttrSet<java.l throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public CertificateValidity(java.util.Date notBefore, java.util.Date notAfter) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateVersion.java b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateVersion.java index 85ad759697..3b3c1808af 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateVersion.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateVersion.java @@ -34,7 +34,7 @@ public class CertificateVersion implements sun.security.x509.CertAttrSet<java.la throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public CertificateVersion(int version) throws java.io.IOException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateX509Key.java b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateX509Key.java index 6f4505731f..ff5cc1d0d9 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/CertificateX509Key.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/CertificateX509Key.java @@ -30,7 +30,7 @@ import sun.security.util.*; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class CertificateX509Key implements sun.security.x509.CertAttrSet<java.lang.String> { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public CertificateX509Key(java.security.PublicKey key) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/Extension.java b/ojluni/annotations/hiddenapi/sun/security/x509/Extension.java index f4acc6c4f5..60cd779617 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/Extension.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/Extension.java @@ -44,7 +44,7 @@ public class Extension implements java.security.cert.Extension { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public Extension(sun.security.x509.Extension ext) { throw new RuntimeException("Stub!"); } @@ -61,7 +61,7 @@ public class Extension implements java.security.cert.Extension { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void encode(sun.security.util.DerOutputStream out) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -70,7 +70,7 @@ public class Extension implements java.security.cert.Extension { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.util.ObjectIdentifier getExtensionId() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/GeneralName.java b/ojluni/annotations/hiddenapi/sun/security/x509/GeneralName.java index c7eb02e419..9fa401c18b 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/GeneralName.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/GeneralName.java @@ -30,7 +30,7 @@ import sun.security.util.*; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class GeneralName { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public GeneralName(sun.security.x509.GeneralNameInterface name) { throw new RuntimeException("Stub!"); } @@ -44,12 +44,12 @@ public class GeneralName { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public int getType() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.x509.GeneralNameInterface getName() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/GeneralNames.java b/ojluni/annotations/hiddenapi/sun/security/x509/GeneralNames.java index fdac69f2c8..df5f5eecd5 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/GeneralNames.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/GeneralNames.java @@ -31,17 +31,17 @@ import sun.security.util.*; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class GeneralNames { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public GeneralNames(sun.security.util.DerValue derVal) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public GeneralNames() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.x509.GeneralNames add(sun.security.x509.GeneralName name) { throw new RuntimeException("Stub!"); } @@ -50,7 +50,7 @@ public class GeneralNames { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public boolean isEmpty() { throw new RuntimeException("Stub!"); } @@ -67,7 +67,7 @@ public class GeneralNames { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void encode(sun.security.util.DerOutputStream out) throws java.io.IOException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/KeyIdentifier.java b/ojluni/annotations/hiddenapi/sun/security/x509/KeyIdentifier.java index 8faa83a363..427b1334d1 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/KeyIdentifier.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/KeyIdentifier.java @@ -38,12 +38,12 @@ public class KeyIdentifier { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public KeyIdentifier(java.security.PublicKey pubKey) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] getIdentifier() { throw new RuntimeException("Stub!"); } @@ -64,5 +64,5 @@ public class KeyIdentifier { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage private byte[] octetString; + @android.compat.annotation.UnsupportedAppUsage private byte[] octetString; } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/KeyUsageExtension.java b/ojluni/annotations/hiddenapi/sun/security/x509/KeyUsageExtension.java index e9addc9e03..cd2ff3ecf6 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/KeyUsageExtension.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/KeyUsageExtension.java @@ -35,7 +35,7 @@ public class KeyUsageExtension extends sun.security.x509.Extension throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public KeyUsageExtension(boolean[] bitString) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -69,7 +69,7 @@ public class KeyUsageExtension extends sun.security.x509.Extension throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.Boolean get(java.lang.String name) throws java.io.IOException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/NetscapeCertTypeExtension.java b/ojluni/annotations/hiddenapi/sun/security/x509/NetscapeCertTypeExtension.java index 88e4f118a7..2db2b558a5 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/NetscapeCertTypeExtension.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/NetscapeCertTypeExtension.java @@ -32,7 +32,7 @@ import sun.security.util.*; public class NetscapeCertTypeExtension extends sun.security.x509.Extension implements sun.security.x509.CertAttrSet<java.lang.String> { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public NetscapeCertTypeExtension(byte[] bitString) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -70,7 +70,7 @@ public class NetscapeCertTypeExtension extends sun.security.x509.Extension throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.Boolean get(java.lang.String name) throws java.io.IOException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/OIDMap.java b/ojluni/annotations/hiddenapi/sun/security/x509/OIDMap.java index 8186c239e5..12be25abc1 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/OIDMap.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/OIDMap.java @@ -60,7 +60,7 @@ public class OIDMap { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static java.lang.Class<?> getClass(sun.security.util.ObjectIdentifier oid) throws java.security.cert.CertificateException { throw new RuntimeException("Stub!"); @@ -136,14 +136,14 @@ public class OIDMap { private static final java.lang.String SUB_KEY_IDENTIFIER = "x509.info.extensions.SubjectKeyIdentifier"; - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private static final java.util.Map<java.lang.String, sun.security.x509.OIDMap.OIDInfo> nameMap; static { nameMap = null; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private static final java.util.Map< sun.security.util.ObjectIdentifier, sun.security.x509.OIDMap.OIDInfo> oidMap; @@ -166,7 +166,7 @@ public class OIDMap { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage private volatile java.lang.Class<?> clazz; + @android.compat.annotation.UnsupportedAppUsage private volatile java.lang.Class<?> clazz; final java.lang.String name; diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/PKIXExtensions.java b/ojluni/annotations/hiddenapi/sun/security/x509/PKIXExtensions.java index de3027a1c9..105172c9c7 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/PKIXExtensions.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/PKIXExtensions.java @@ -95,7 +95,7 @@ public class PKIXExtensions { CRLNumber_data = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier CertificateIssuer_Id; static { diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/SerialNumber.java b/ojluni/annotations/hiddenapi/sun/security/x509/SerialNumber.java index 1c14ef3f9b..f6b1663e92 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/SerialNumber.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/SerialNumber.java @@ -42,7 +42,7 @@ public class SerialNumber { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public SerialNumber(sun.security.util.DerValue val) throws java.io.IOException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/SubjectAlternativeNameExtension.java b/ojluni/annotations/hiddenapi/sun/security/x509/SubjectAlternativeNameExtension.java index 44aa6ab2f5..9b1ed0b080 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/SubjectAlternativeNameExtension.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/SubjectAlternativeNameExtension.java @@ -67,7 +67,7 @@ public class SubjectAlternativeNameExtension extends sun.security.x509.Extension throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.x509.GeneralNames get(java.lang.String name) throws java.io.IOException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/SubjectKeyIdentifierExtension.java b/ojluni/annotations/hiddenapi/sun/security/x509/SubjectKeyIdentifierExtension.java index 2a85bd5f4d..a9c323d940 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/SubjectKeyIdentifierExtension.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/SubjectKeyIdentifierExtension.java @@ -25,13 +25,11 @@ package sun.security.x509; -import sun.security.util.*; - @SuppressWarnings({"unchecked", "deprecation", "all"}) public class SubjectKeyIdentifierExtension extends sun.security.x509.Extension implements sun.security.x509.CertAttrSet<java.lang.String> { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public SubjectKeyIdentifierExtension(byte[] octetString) throws java.io.IOException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/URIName.java b/ojluni/annotations/hiddenapi/sun/security/x509/URIName.java index 5030158ede..5b8ee8f820 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/URIName.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/URIName.java @@ -25,8 +25,6 @@ package sun.security.x509; -import sun.security.util.*; - @SuppressWarnings({"unchecked", "deprecation", "all"}) public class URIName implements sun.security.x509.GeneralNameInterface { @@ -67,12 +65,12 @@ public class URIName implements sun.security.x509.GeneralNameInterface { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.String getName() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.String getScheme() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/UniqueIdentity.java b/ojluni/annotations/hiddenapi/sun/security/x509/UniqueIdentity.java index b43e762889..c5b0995d5c 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/UniqueIdentity.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/UniqueIdentity.java @@ -25,8 +25,6 @@ package sun.security.x509; -import sun.security.util.*; - @SuppressWarnings({"unchecked", "deprecation", "all"}) public class UniqueIdentity { @@ -38,12 +36,12 @@ public class UniqueIdentity { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public UniqueIdentity(sun.security.util.DerInputStream in) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public UniqueIdentity(sun.security.util.DerValue derVal) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -52,7 +50,7 @@ public class UniqueIdentity { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void encode(sun.security.util.DerOutputStream out, byte tag) throws java.io.IOException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/X500Name.java b/ojluni/annotations/hiddenapi/sun/security/x509/X500Name.java index 4c697abeec..fd8e9b6a03 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/X500Name.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/X500Name.java @@ -26,14 +26,10 @@ package sun.security.x509; -import java.lang.reflect.*; -import java.util.*; -import sun.security.util.*; - @SuppressWarnings({"unchecked", "deprecation", "all"}) public class X500Name implements sun.security.x509.GeneralNameInterface, java.security.Principal { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X500Name(java.lang.String dname) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -44,12 +40,12 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X500Name(java.lang.String dname, java.lang.String format) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X500Name( java.lang.String commonName, java.lang.String organizationUnit, @@ -59,7 +55,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X500Name( java.lang.String commonName, java.lang.String organizationUnit, @@ -75,17 +71,17 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X500Name(sun.security.util.DerValue value) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X500Name(sun.security.util.DerInputStream in) throws java.io.IOException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X500Name(byte[] name) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -98,7 +94,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.util.List<sun.security.x509.AVA> allAvas() { throw new RuntimeException("Stub!"); } @@ -107,7 +103,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public boolean isEmpty() { throw new RuntimeException("Stub!"); } @@ -141,7 +137,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.String getCommonName() throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -235,7 +231,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void encode(sun.security.util.DerOutputStream out) throws java.io.IOException { throw new RuntimeException("Stub!"); } @@ -300,12 +296,12 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public javax.security.auth.x500.X500Principal asX500Principal() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static sun.security.x509.X500Name asX500Name(javax.security.auth.x500.X500Principal p) { throw new RuntimeException("Stub!"); } @@ -316,7 +312,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se DNQUALIFIER_DATA = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier DNQUALIFIER_OID; static { @@ -329,7 +325,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se DOMAIN_COMPONENT_DATA = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier DOMAIN_COMPONENT_OID; static { @@ -342,7 +338,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se GENERATIONQUALIFIER_DATA = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier GENERATIONQUALIFIER_OID; static { @@ -355,7 +351,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se GIVENNAME_DATA = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier GIVENNAME_OID; static { @@ -368,7 +364,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se INITIALS_DATA = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier INITIALS_OID; static { @@ -381,7 +377,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se SERIALNUMBER_DATA = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier SERIALNUMBER_OID; static { @@ -394,7 +390,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se SURNAME_DATA = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier SURNAME_OID; static { @@ -411,7 +407,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se commonName_data = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier commonName_oid; static { @@ -424,7 +420,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se countryName_data = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier countryName_oid; static { @@ -449,7 +445,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se ipAddress_data = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier ipAddress_oid; static { @@ -462,7 +458,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se localityName_data = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier localityName_oid; static { @@ -477,7 +473,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se orgName_data = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier orgName_oid; static { @@ -490,7 +486,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se orgUnitName_data = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier orgUnitName_oid; static { @@ -522,7 +518,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se stateName_data = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier stateName_oid; static { @@ -535,7 +531,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se streetAddress_data = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier streetAddress_oid; static { @@ -548,7 +544,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se title_data = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier title_oid; static { @@ -561,7 +557,7 @@ public class X500Name implements sun.security.x509.GeneralNameInterface, java.se userid_data = new int[0]; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final sun.security.util.ObjectIdentifier userid_oid; static { diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/X509CRLEntryImpl.java b/ojluni/annotations/hiddenapi/sun/security/x509/X509CRLEntryImpl.java index 066a4adc8f..5684afae03 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/X509CRLEntryImpl.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/X509CRLEntryImpl.java @@ -25,9 +25,6 @@ package sun.security.x509; -import java.util.*; -import sun.security.util.*; - @SuppressWarnings({"unchecked", "deprecation", "all"}) public class X509CRLEntryImpl extends java.security.cert.X509CRLEntry implements java.lang.Comparable<sun.security.x509.X509CRLEntryImpl> { @@ -120,7 +117,7 @@ public class X509CRLEntryImpl extends java.security.cert.X509CRLEntry throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.security.x509.Extension getExtension(sun.security.util.ObjectIdentifier oid) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/X509CRLImpl.java b/ojluni/annotations/hiddenapi/sun/security/x509/X509CRLImpl.java index 7f353dec58..64cf8db913 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/X509CRLImpl.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/X509CRLImpl.java @@ -25,9 +25,6 @@ package sun.security.x509; -import java.util.*; -import sun.security.util.*; - @SuppressWarnings({"unchecked", "deprecation", "all"}) public class X509CRLImpl extends java.security.cert.X509CRL implements sun.security.util.DerEncoder { @@ -36,17 +33,17 @@ public class X509CRLImpl extends java.security.cert.X509CRL throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X509CRLImpl(byte[] crlData) throws java.security.cert.CRLException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X509CRLImpl(sun.security.util.DerValue val) throws java.security.cert.CRLException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X509CRLImpl(java.io.InputStream inStrm) throws java.security.cert.CRLException { throw new RuntimeException("Stub!"); } @@ -75,7 +72,7 @@ public class X509CRLImpl extends java.security.cert.X509CRL throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] getEncodedInternal() throws java.security.cert.CRLException { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/X509CertImpl.java b/ojluni/annotations/hiddenapi/sun/security/x509/X509CertImpl.java index 9333689381..5188e10e33 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/X509CertImpl.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/X509CertImpl.java @@ -25,11 +25,6 @@ package sun.security.x509; -import java.security.*; -import java.security.cert.*; -import java.util.*; -import sun.security.util.*; - @SuppressWarnings({"unchecked", "deprecation", "all"}) public class X509CertImpl extends java.security.cert.X509Certificate implements sun.security.util.DerEncoder { @@ -38,17 +33,17 @@ public class X509CertImpl extends java.security.cert.X509Certificate throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X509CertImpl(byte[] certData) throws java.security.cert.CertificateException { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X509CertImpl(sun.security.x509.X509CertInfo certInfo) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X509CertImpl(sun.security.util.DerValue derVal) throws java.security.cert.CertificateException { throw new RuntimeException("Stub!"); @@ -72,7 +67,7 @@ public class X509CertImpl extends java.security.cert.X509Certificate throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public byte[] getEncodedInternal() throws java.security.cert.CertificateEncodingException { throw new RuntimeException("Stub!"); } @@ -106,7 +101,7 @@ public class X509CertImpl extends java.security.cert.X509Certificate throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void sign(java.security.PrivateKey key, java.lang.String algorithm) throws java.security.cert.CertificateException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException, @@ -134,7 +129,7 @@ public class X509CertImpl extends java.security.cert.X509Certificate throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.Object get(java.lang.String name) throws java.security.cert.CertificateParsingException { throw new RuntimeException("Stub!"); @@ -366,7 +361,7 @@ public class X509CertImpl extends java.security.cert.X509Certificate throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private void parse(sun.security.util.DerValue val) throws java.security.cert.CertificateException, java.io.IOException { throw new RuntimeException("Stub!"); @@ -460,7 +455,7 @@ public class X509CertImpl extends java.security.cert.X509Certificate public static final java.lang.String VERSION = "x509.info.version.number"; - @dalvik.annotation.compat.UnsupportedAppUsage protected sun.security.x509.AlgorithmId algId; + @android.compat.annotation.UnsupportedAppUsage protected sun.security.x509.AlgorithmId algId; private java.util.Set<sun.security.x509.AccessDescription> authInfoAccess; @@ -472,13 +467,13 @@ public class X509CertImpl extends java.security.cert.X509Certificate private java.util.Collection<java.util.List<?>> issuerAlternativeNames; - @dalvik.annotation.compat.UnsupportedAppUsage private boolean readOnly = false; + @android.compat.annotation.UnsupportedAppUsage private boolean readOnly = false; private static final long serialVersionUID = -3457612960190864406L; // 0xd0041754f90963eaL - @dalvik.annotation.compat.UnsupportedAppUsage protected byte[] signature; + @android.compat.annotation.UnsupportedAppUsage protected byte[] signature; - @dalvik.annotation.compat.UnsupportedAppUsage private byte[] signedCert; + @android.compat.annotation.UnsupportedAppUsage private byte[] signedCert; private java.util.Collection<java.util.List<?>> subjectAlternativeNames; diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/X509CertInfo.java b/ojluni/annotations/hiddenapi/sun/security/x509/X509CertInfo.java index 21b4d6195f..2309a50c0c 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/X509CertInfo.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/X509CertInfo.java @@ -25,19 +25,15 @@ package sun.security.x509; -import java.security.cert.*; -import java.util.*; -import sun.security.util.*; - @SuppressWarnings({"unchecked", "deprecation", "all"}) public class X509CertInfo implements sun.security.x509.CertAttrSet<java.lang.String> { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X509CertInfo() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X509CertInfo(byte[] cert) throws java.security.cert.CertificateParsingException { throw new RuntimeException("Stub!"); } @@ -80,7 +76,7 @@ public class X509CertInfo implements sun.security.x509.CertAttrSet<java.lang.Str throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void set(java.lang.String name, java.lang.Object val) throws java.security.cert.CertificateException, java.io.IOException { throw new RuntimeException("Stub!"); @@ -91,7 +87,7 @@ public class X509CertInfo implements sun.security.x509.CertAttrSet<java.lang.Str throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.Object get(java.lang.String name) throws java.security.cert.CertificateException, java.io.IOException { throw new RuntimeException("Stub!"); diff --git a/ojluni/annotations/hiddenapi/sun/security/x509/X509Key.java b/ojluni/annotations/hiddenapi/sun/security/x509/X509Key.java index 2a830d7285..8c4924feaf 100644 --- a/ojluni/annotations/hiddenapi/sun/security/x509/X509Key.java +++ b/ojluni/annotations/hiddenapi/sun/security/x509/X509Key.java @@ -25,13 +25,10 @@ package sun.security.x509; -import java.io.*; -import sun.security.util.*; - @SuppressWarnings({"unchecked", "deprecation", "all"}) public class X509Key implements java.security.PublicKey { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X509Key() { throw new RuntimeException("Stub!"); } @@ -49,7 +46,7 @@ public class X509Key implements java.security.PublicKey { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static java.security.PublicKey parse(sun.security.util.DerValue in) throws java.io.IOException { throw new RuntimeException("Stub!"); @@ -129,15 +126,15 @@ public class X509Key implements java.security.PublicKey { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage protected sun.security.x509.AlgorithmId algid; + @android.compat.annotation.UnsupportedAppUsage protected sun.security.x509.AlgorithmId algid; private sun.security.util.BitArray bitStringKey; - @dalvik.annotation.compat.UnsupportedAppUsage protected byte[] encodedKey; + @android.compat.annotation.UnsupportedAppUsage protected byte[] encodedKey; - @Deprecated @dalvik.annotation.compat.UnsupportedAppUsage protected byte[] key; + @Deprecated @android.compat.annotation.UnsupportedAppUsage protected byte[] key; private static final long serialVersionUID = -5359250853002055002L; // 0xb5a01dbe649a72a6L - @Deprecated @dalvik.annotation.compat.UnsupportedAppUsage private int unusedBits = 0; // 0x0 + @Deprecated @android.compat.annotation.UnsupportedAppUsage private int unusedBits = 0; // 0x0 } diff --git a/ojluni/annotations/hiddenapi/sun/util/calendar/AbstractCalendar.java b/ojluni/annotations/hiddenapi/sun/util/calendar/AbstractCalendar.java index dd8fd2bf43..3e1be5eaa3 100644 --- a/ojluni/annotations/hiddenapi/sun/util/calendar/AbstractCalendar.java +++ b/ojluni/annotations/hiddenapi/sun/util/calendar/AbstractCalendar.java @@ -37,7 +37,7 @@ public abstract class AbstractCalendar extends sun.util.calendar.CalendarSystem throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.util.calendar.Era[] getEras() { throw new RuntimeException("Stub!"); } @@ -75,7 +75,7 @@ public abstract class AbstractCalendar extends sun.util.calendar.CalendarSystem throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public long getTimeOfDayValue(sun.util.calendar.CalendarDate date) { throw new RuntimeException("Stub!"); } @@ -104,7 +104,7 @@ public abstract class AbstractCalendar extends sun.util.calendar.CalendarSystem throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static long getDayOfWeekDateOnOrBefore(long fixedDate, int dayOfWeek) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/util/calendar/BaseCalendar.java b/ojluni/annotations/hiddenapi/sun/util/calendar/BaseCalendar.java index 8c8f122598..660ba87686 100644 --- a/ojluni/annotations/hiddenapi/sun/util/calendar/BaseCalendar.java +++ b/ojluni/annotations/hiddenapi/sun/util/calendar/BaseCalendar.java @@ -185,10 +185,10 @@ public abstract class BaseCalendar extends sun.util.calendar.AbstractCalendar { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public abstract int getNormalizedYear(); - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public abstract void setNormalizedYear(int normalizedYear); protected final boolean hit(int year) { diff --git a/ojluni/annotations/hiddenapi/sun/util/calendar/CalendarDate.java b/ojluni/annotations/hiddenapi/sun/util/calendar/CalendarDate.java index f63c574701..165920c7c1 100644 --- a/ojluni/annotations/hiddenapi/sun/util/calendar/CalendarDate.java +++ b/ojluni/annotations/hiddenapi/sun/util/calendar/CalendarDate.java @@ -45,7 +45,7 @@ public abstract class CalendarDate implements java.lang.Cloneable { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public int getYear() { throw new RuntimeException("Stub!"); } @@ -66,7 +66,7 @@ public abstract class CalendarDate implements java.lang.Cloneable { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public int getMonth() { throw new RuntimeException("Stub!"); } @@ -79,12 +79,12 @@ public abstract class CalendarDate implements java.lang.Cloneable { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public int getDayOfMonth() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.util.calendar.CalendarDate setDayOfMonth(int date) { throw new RuntimeException("Stub!"); } @@ -101,7 +101,7 @@ public abstract class CalendarDate implements java.lang.Cloneable { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.util.calendar.CalendarDate setHours(int hours) { throw new RuntimeException("Stub!"); } @@ -114,7 +114,7 @@ public abstract class CalendarDate implements java.lang.Cloneable { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.util.calendar.CalendarDate setMinutes(int minutes) { throw new RuntimeException("Stub!"); } @@ -127,7 +127,7 @@ public abstract class CalendarDate implements java.lang.Cloneable { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.util.calendar.CalendarDate setSeconds(int seconds) { throw new RuntimeException("Stub!"); } @@ -140,7 +140,7 @@ public abstract class CalendarDate implements java.lang.Cloneable { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.util.calendar.CalendarDate setMillis(int millis) { throw new RuntimeException("Stub!"); } @@ -149,12 +149,12 @@ public abstract class CalendarDate implements java.lang.Cloneable { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public long getTimeOfDay() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.util.calendar.CalendarDate setDate(int year, int month, int dayOfMonth) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/util/calendar/CalendarSystem.java b/ojluni/annotations/hiddenapi/sun/util/calendar/CalendarSystem.java index bddd682e4c..c84764100c 100644 --- a/ojluni/annotations/hiddenapi/sun/util/calendar/CalendarSystem.java +++ b/ojluni/annotations/hiddenapi/sun/util/calendar/CalendarSystem.java @@ -34,12 +34,12 @@ public abstract class CalendarSystem { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static sun.util.calendar.Gregorian getGregorianCalendar() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static sun.util.calendar.CalendarSystem forName(java.lang.String calendarName) { throw new RuntimeException("Stub!"); } @@ -62,10 +62,10 @@ public abstract class CalendarSystem { public abstract sun.util.calendar.CalendarDate newCalendarDate(); - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public abstract sun.util.calendar.CalendarDate newCalendarDate(java.util.TimeZone zone); - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public abstract long getTime(sun.util.calendar.CalendarDate date); public abstract int getYearLength(sun.util.calendar.CalendarDate date); @@ -88,7 +88,7 @@ public abstract class CalendarSystem { public abstract sun.util.calendar.CalendarDate setTimeOfDay( sun.util.calendar.CalendarDate date, int timeOfDay); - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public abstract boolean validate(sun.util.calendar.CalendarDate date); public abstract boolean normalize(sun.util.calendar.CalendarDate date); diff --git a/ojluni/annotations/hiddenapi/sun/util/calendar/CalendarUtils.java b/ojluni/annotations/hiddenapi/sun/util/calendar/CalendarUtils.java index 9ecd8dc60a..2a05603a14 100644 --- a/ojluni/annotations/hiddenapi/sun/util/calendar/CalendarUtils.java +++ b/ojluni/annotations/hiddenapi/sun/util/calendar/CalendarUtils.java @@ -40,12 +40,12 @@ public class CalendarUtils { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final long floorDivide(long n, long d) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final int floorDivide(int n, int d) { throw new RuntimeException("Stub!"); } @@ -58,12 +58,12 @@ public class CalendarUtils { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final long mod(long x, long y) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public static final int mod(int x, int y) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/util/calendar/Era.java b/ojluni/annotations/hiddenapi/sun/util/calendar/Era.java index 28e50951a5..49aa034d7b 100644 --- a/ojluni/annotations/hiddenapi/sun/util/calendar/Era.java +++ b/ojluni/annotations/hiddenapi/sun/util/calendar/Era.java @@ -28,12 +28,12 @@ package sun.util.calendar; @SuppressWarnings({"unchecked", "deprecation", "all"}) public final class Era { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public Era(java.lang.String name, java.lang.String abbr, long since, boolean localTime) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.String getName() { throw new RuntimeException("Stub!"); } @@ -42,7 +42,7 @@ public final class Era { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public java.lang.String getAbbreviation() { throw new RuntimeException("Stub!"); } @@ -55,7 +55,7 @@ public final class Era { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.util.calendar.CalendarDate getSinceDate() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/util/calendar/ImmutableGregorianDate.java b/ojluni/annotations/hiddenapi/sun/util/calendar/ImmutableGregorianDate.java index 825e9d6a12..aa92656962 100644 --- a/ojluni/annotations/hiddenapi/sun/util/calendar/ImmutableGregorianDate.java +++ b/ojluni/annotations/hiddenapi/sun/util/calendar/ImmutableGregorianDate.java @@ -242,7 +242,7 @@ class ImmutableGregorianDate extends sun.util.calendar.BaseCalendar.Date { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage private void unsupported() { throw new RuntimeException("Stub!"); } diff --git a/ojluni/annotations/hiddenapi/sun/util/calendar/LocalGregorianCalendar.java b/ojluni/annotations/hiddenapi/sun/util/calendar/LocalGregorianCalendar.java index 95267d05d5..b1320c5f2f 100644 --- a/ojluni/annotations/hiddenapi/sun/util/calendar/LocalGregorianCalendar.java +++ b/ojluni/annotations/hiddenapi/sun/util/calendar/LocalGregorianCalendar.java @@ -68,12 +68,12 @@ public class LocalGregorianCalendar extends sun.util.calendar.BaseCalendar { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.util.calendar.LocalGregorianCalendar.Date newCalendarDate(java.util.TimeZone zone) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public boolean validate(sun.util.calendar.CalendarDate date) { throw new RuntimeException("Stub!"); } @@ -82,7 +82,7 @@ public class LocalGregorianCalendar extends sun.util.calendar.BaseCalendar { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public boolean normalize(sun.util.calendar.CalendarDate date) { throw new RuntimeException("Stub!"); } @@ -122,7 +122,7 @@ public class LocalGregorianCalendar extends sun.util.calendar.BaseCalendar { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.util.calendar.LocalGregorianCalendar.Date setEra(sun.util.calendar.Era era) { throw new RuntimeException("Stub!"); } @@ -131,17 +131,17 @@ public class LocalGregorianCalendar extends sun.util.calendar.BaseCalendar { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public sun.util.calendar.LocalGregorianCalendar.Date setYear(int localYear) { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public int getNormalizedYear() { throw new RuntimeException("Stub!"); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void setNormalizedYear(int normalizedYear) { throw new RuntimeException("Stub!"); } |