Remove @CorePlatformApi usage in libcore/
No behavior change is expected, because the kCorePlatformApi bit of
each method / field is still set in the core-libart and core-oj dex
files. During the build of ART module, the module-lib stub is passed as
a core_platform_api stub in the "art-bootclasspath-fragment", and thus set
the kCorePlatformApi into the generated dex files.
Bug: 192446466
Test: m droid
Change-Id: Ia9371b93184c678dc42f2bff582f381d1e5f5ac2
diff --git a/dalvik/src/main/java/dalvik/annotation/codegen/CovariantReturnType.java b/dalvik/src/main/java/dalvik/annotation/codegen/CovariantReturnType.java
index 95a87af..f131f8b 100644
--- a/dalvik/src/main/java/dalvik/annotation/codegen/CovariantReturnType.java
+++ b/dalvik/src/main/java/dalvik/annotation/codegen/CovariantReturnType.java
@@ -65,7 +65,6 @@
@Retention(RetentionPolicy.CLASS)
@Target({ ElementType.METHOD})
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public @interface CovariantReturnType {
/**
@@ -75,7 +74,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
Class<?> returnType();
/**
@@ -85,18 +83,15 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
int presentAfter();
/** @hide */
@Retention(RetentionPolicy.CLASS)
@Target({ElementType.METHOD})
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@interface CovariantReturnTypes {
/** @hide */
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
CovariantReturnType[] value();
}
}
diff --git a/dalvik/src/main/java/dalvik/annotation/optimization/CriticalNative.java b/dalvik/src/main/java/dalvik/annotation/optimization/CriticalNative.java
index 0dac897..2f30bc0 100644
--- a/dalvik/src/main/java/dalvik/annotation/optimization/CriticalNative.java
+++ b/dalvik/src/main/java/dalvik/annotation/optimization/CriticalNative.java
@@ -97,7 +97,6 @@
*
* @hide
*/
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
@Retention(RetentionPolicy.CLASS) // Save memory, don't instantiate as an object at runtime.
@Target(ElementType.METHOD)
diff --git a/dalvik/src/main/java/dalvik/annotation/optimization/FastNative.java b/dalvik/src/main/java/dalvik/annotation/optimization/FastNative.java
index db3efe0..04aa7b8 100644
--- a/dalvik/src/main/java/dalvik/annotation/optimization/FastNative.java
+++ b/dalvik/src/main/java/dalvik/annotation/optimization/FastNative.java
@@ -76,7 +76,6 @@
*
* @hide
*/
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
@libcore.api.IntraCoreApi
@Retention(RetentionPolicy.CLASS) // Save memory, don't instantiate as an object at runtime.
diff --git a/dalvik/src/main/java/dalvik/system/AppSpecializationHooks.java b/dalvik/src/main/java/dalvik/system/AppSpecializationHooks.java
index e311902..5c05f46 100644
--- a/dalvik/src/main/java/dalvik/system/AppSpecializationHooks.java
+++ b/dalvik/src/main/java/dalvik/system/AppSpecializationHooks.java
@@ -26,7 +26,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public class AppSpecializationHooks {
private AppSpecializationHooks() {}
@@ -43,7 +42,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void handleCompatChangesBeforeBindingApplication() {
com.android.i18n.system.AppSpecializationHooks
.handleCompatChangesBeforeBindingApplication();
diff --git a/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java b/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java
index 60511a9..ee9c057 100644
--- a/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java
+++ b/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java
@@ -145,7 +145,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public void reportClassLoaderChain() {
if (reporter == null) {
return;
@@ -234,7 +233,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public void addDexPath(@Nullable String dexPath) {
addDexPath(dexPath, false /*isTrusted*/);
}
@@ -256,7 +254,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public void addNativePath(@NonNull Collection<String> libPaths) {
pathList.addNativePath(libPaths);
}
@@ -353,7 +350,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public @NonNull String getLdLibraryPath() {
StringBuilder result = new StringBuilder();
for (File directory : pathList.getNativeLibraryDirectories()) {
@@ -379,7 +375,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setReporter(@Nullable Reporter newReporter) {
reporter = newReporter;
}
@@ -398,7 +393,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public interface Reporter {
/**
* Reports the construction of a BaseDexClassLoader and provides opaque information about
@@ -413,7 +407,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
void report(@NonNull Map<String, String> contextsMap);
}
}
diff --git a/dalvik/src/main/java/dalvik/system/BlockGuard.java b/dalvik/src/main/java/dalvik/system/BlockGuard.java
index 3472f70..ecc2e92 100644
--- a/dalvik/src/main/java/dalvik/system/BlockGuard.java
+++ b/dalvik/src/main/java/dalvik/system/BlockGuard.java
@@ -38,7 +38,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public final class BlockGuard {
@@ -51,7 +50,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public interface Policy {
/**
@@ -60,7 +58,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
void onWriteToDisk();
/**
@@ -70,7 +67,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
void onReadFromDisk();
/**
@@ -88,7 +84,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
void onUnbufferedIO();
/**
@@ -109,7 +104,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
int getPolicyMask();
}
@@ -118,7 +112,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public interface VmPolicy {
/**
* Called by core libraries code when the given path is accessed. This
@@ -142,7 +135,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
void onPathAccess(@NonNull String path);
}
@@ -200,7 +192,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final Policy LAX_POLICY = new Policy() {
@Override public String toString() { return "LAX_POLICY"; }
@Override public void onWriteToDisk() {}
@@ -221,7 +212,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final VmPolicy LAX_VM_POLICY = new VmPolicy() {
@Override public String toString() { return "LAX_VM_POLICY"; }
@Override public void onPathAccess(String path) {}
@@ -246,7 +236,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public static @NonNull Policy getThreadPolicy() {
return threadPolicy.get();
@@ -265,7 +254,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setThreadPolicy(@NonNull Policy policy) {
threadPolicy.set(Objects.requireNonNull(policy));
}
@@ -279,7 +267,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static @NonNull VmPolicy getVmPolicy() {
return vmPolicy;
}
@@ -296,7 +283,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setVmPolicy(@NonNull VmPolicy policy) {
vmPolicy = Objects.requireNonNull(policy);
}
diff --git a/dalvik/src/main/java/dalvik/system/CloseGuard.java b/dalvik/src/main/java/dalvik/system/CloseGuard.java
index 959a5a3..e56ad2b 100644
--- a/dalvik/src/main/java/dalvik/system/CloseGuard.java
+++ b/dalvik/src/main/java/dalvik/system/CloseGuard.java
@@ -114,7 +114,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public final class CloseGuard {
@@ -151,7 +150,6 @@
*/
@UnsupportedAppUsage(trackingBug=111170242)
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public static CloseGuard get() {
return new CloseGuard();
@@ -170,7 +168,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setEnabled(boolean enabled) {
CloseGuard.stackAndTrackingEnabled = enabled;
}
@@ -194,7 +191,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setReporter(Reporter rep) {
if (rep == null) {
throw new NullPointerException("reporter == null");
@@ -210,7 +206,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static Reporter getReporter() {
return reporter;
}
@@ -257,7 +252,6 @@
*/
@UnsupportedAppUsage(trackingBug=111170242)
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public void open(String closer) {
openWithCallSite(closer, null /* callsite */);
@@ -276,7 +270,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public void openWithCallSite(String closer, String callsite) {
// always perform the check for valid API usage...
if (closer == null) {
@@ -315,7 +308,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public void close() {
Tracker tracker = currentTracker;
@@ -337,7 +329,6 @@
*/
@UnsupportedAppUsage(trackingBug=111170242)
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public void warnIfOpen() {
if (closerNameOrAllocationInfo != null) {
@@ -371,7 +362,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public interface Reporter {
/**
*
@@ -379,7 +369,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
void report(String message, Throwable allocationSite);
/**
@@ -387,7 +376,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
default void report(String message) {}
}
diff --git a/dalvik/src/main/java/dalvik/system/DelegateLastClassLoader.java b/dalvik/src/main/java/dalvik/system/DelegateLastClassLoader.java
index 5966139..f5e40b6 100644
--- a/dalvik/src/main/java/dalvik/system/DelegateLastClassLoader.java
+++ b/dalvik/src/main/java/dalvik/system/DelegateLastClassLoader.java
@@ -132,7 +132,6 @@
*
* @hide
*/
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public DelegateLastClassLoader(
String dexPath, String librarySearchPath, ClassLoader parent,
diff --git a/dalvik/src/main/java/dalvik/system/DexFile.java b/dalvik/src/main/java/dalvik/system/DexFile.java
index f8e7f42..8a4fb46 100644
--- a/dalvik/src/main/java/dalvik/system/DexFile.java
+++ b/dalvik/src/main/java/dalvik/system/DexFile.java
@@ -465,7 +465,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int NO_DEXOPT_NEEDED = 0;
/**
@@ -496,7 +495,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int DEX2OAT_FOR_FILTER = 3;
@@ -544,7 +542,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native int getDexOptNeeded(@NonNull String fileName,
@NonNull String instructionSet, @NonNull String compilerFilter, @Nullable String classLoaderContext,
boolean newProfile, boolean downgrade)
@@ -570,7 +567,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final class OptimizationInfo {
// The human readable refined optimization status of the validity of the odex file.
private final String status;
@@ -591,7 +587,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public @NonNull String getStatus() {
return status;
}
@@ -604,7 +599,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public @NonNull String getReason() {
return reason;
}
@@ -621,7 +615,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static @NonNull OptimizationInfo getDexFileOptimizationInfo(
@NonNull String fileName, @NonNull String instructionSet) throws FileNotFoundException {
String[] status = getDexFileOptimizationStatus(fileName, instructionSet);
@@ -655,7 +648,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native @Nullable String[] getDexFileOutputPaths(@NonNull String fileName, @NonNull String instructionSet)
throws FileNotFoundException;
@@ -668,7 +660,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public native static boolean isValidCompilerFilter(@NonNull String filter);
/**
@@ -680,7 +671,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public native static boolean isProfileGuidedCompilerFilter(@NonNull String filter);
/**
@@ -706,7 +696,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public native static @NonNull String getSafeModeCompilerFilter(@NonNull String filter);
/**
diff --git a/dalvik/src/main/java/dalvik/system/PathClassLoader.java b/dalvik/src/main/java/dalvik/system/PathClassLoader.java
index 1b74cd9..2cd3b61 100644
--- a/dalvik/src/main/java/dalvik/system/PathClassLoader.java
+++ b/dalvik/src/main/java/dalvik/system/PathClassLoader.java
@@ -100,7 +100,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public PathClassLoader(
@NonNull String dexPath, @Nullable String librarySearchPath, @Nullable ClassLoader parent,
@Nullable ClassLoader[] sharedLibraryLoaders) {
diff --git a/dalvik/src/main/java/dalvik/system/RuntimeHooks.java b/dalvik/src/main/java/dalvik/system/RuntimeHooks.java
index d86998b..4217e63 100644
--- a/dalvik/src/main/java/dalvik/system/RuntimeHooks.java
+++ b/dalvik/src/main/java/dalvik/system/RuntimeHooks.java
@@ -37,7 +37,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class RuntimeHooks {
private static Supplier<String> zoneIdSupplier;
@@ -61,7 +60,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setTimeZoneIdSupplier(@NonNull Supplier<String> zoneIdSupplier) {
if (RuntimeHooks.zoneIdSupplier != null) {
throw new UnsupportedOperationException("zoneIdSupplier instance already set");
@@ -91,7 +89,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setUncaughtExceptionPreHandler(
@Nullable Thread.UncaughtExceptionHandler uncaughtExceptionHandler) {
Thread.setUncaughtExceptionPreHandler(uncaughtExceptionHandler);
diff --git a/dalvik/src/main/java/dalvik/system/SocketTagger.java b/dalvik/src/main/java/dalvik/system/SocketTagger.java
index 62803d9..e88acec 100644
--- a/dalvik/src/main/java/dalvik/system/SocketTagger.java
+++ b/dalvik/src/main/java/dalvik/system/SocketTagger.java
@@ -31,7 +31,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public abstract class SocketTagger {
private static SocketTagger tagger = new SocketTagger() {
@@ -44,7 +43,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public SocketTagger() {
}
@@ -59,7 +57,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public abstract void tag(FileDescriptor socketDescriptor) throws SocketException;
/**
@@ -76,7 +73,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public abstract void untag(FileDescriptor socketDescriptor) throws SocketException;
/**
@@ -91,7 +87,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final void tag(Socket socket) throws SocketException {
if (!socket.isClosed()) {
tag(socket.getFileDescriptor$());
@@ -114,7 +109,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final void untag(Socket socket) throws SocketException {
if (!socket.isClosed()) {
untag(socket.getFileDescriptor$());
@@ -132,7 +126,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final void tag(DatagramSocket socket) throws SocketException {
if (!socket.isClosed()) {
tag(socket.getFileDescriptor$());
@@ -154,7 +147,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final void untag(DatagramSocket socket) throws SocketException {
if (!socket.isClosed()) {
untag(socket.getFileDescriptor$());
@@ -169,7 +161,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static synchronized void set(SocketTagger tagger) {
if (tagger == null) {
throw new NullPointerException("tagger == null");
@@ -186,7 +177,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static synchronized SocketTagger get() {
return tagger;
}
diff --git a/dalvik/src/main/java/dalvik/system/VMDebug.java b/dalvik/src/main/java/dalvik/system/VMDebug.java
index 512d5ab..bb13a46 100644
--- a/dalvik/src/main/java/dalvik/system/VMDebug.java
+++ b/dalvik/src/main/java/dalvik/system/VMDebug.java
@@ -38,7 +38,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class VMDebug {
/**
* flag for startMethodTracing(), which adds the results from
@@ -47,7 +46,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
// Must match android.os.Debug.TRACE_COUNT_ALLOCS.
public static final int TRACE_COUNT_ALLOCS = 1;
@@ -71,7 +69,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int KIND_GLOBAL_ALLOCATED_OBJECTS =
KIND_ALLOCATED_OBJECTS;
@@ -82,7 +79,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int KIND_GLOBAL_ALLOCATED_BYTES =
KIND_ALLOCATED_BYTES;
@@ -93,7 +89,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int KIND_GLOBAL_FREED_OBJECTS =
KIND_FREED_OBJECTS;
@@ -104,7 +99,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int KIND_GLOBAL_FREED_BYTES =
KIND_FREED_BYTES;
@@ -115,7 +109,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int KIND_GLOBAL_GC_INVOCATIONS =
KIND_GC_INVOCATIONS;
@@ -126,7 +119,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int KIND_GLOBAL_CLASS_INIT_COUNT =
KIND_CLASS_INIT_COUNT;
@@ -137,7 +129,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int KIND_GLOBAL_CLASS_INIT_TIME =
KIND_CLASS_INIT_TIME;
@@ -148,7 +139,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int KIND_THREAD_ALLOCATED_OBJECTS =
KIND_ALLOCATED_OBJECTS << 16;
@@ -159,7 +149,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int KIND_THREAD_ALLOCATED_BYTES =
KIND_ALLOCATED_BYTES << 16;
@@ -170,7 +159,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int KIND_THREAD_GC_INVOCATIONS =
KIND_GC_INVOCATIONS << 16;
@@ -180,7 +168,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int KIND_ALL_COUNTS = 0xffffffff;
/* all methods are static */
@@ -194,7 +181,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@FastNative
public static native long lastDebuggerActivity();
@@ -207,7 +193,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@FastNative
public static native boolean isDebuggingEnabled();
@@ -220,7 +205,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@FastNative
public static native boolean isDebuggerConnected();
@@ -234,7 +218,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native String[] getVmFeatureList();
/**
@@ -262,7 +245,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void startMethodTracing(String traceFileName, int bufferSize, int flags, boolean samplingEnabled, int intervalUs) {
startMethodTracingFilename(traceFileName, checkBufferSize(bufferSize), flags, samplingEnabled, intervalUs);
}
@@ -289,7 +271,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void startMethodTracing(String traceFileName, FileDescriptor fd, int bufferSize,
int flags, boolean samplingEnabled, int intervalUs,
boolean streamingOutput) {
@@ -317,7 +298,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void startMethodTracingDdms(int bufferSize, int flags, boolean samplingEnabled, int intervalUs) {
startMethodTracingDdmsImpl(checkBufferSize(bufferSize), flags, samplingEnabled, intervalUs);
}
@@ -345,7 +325,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native int getMethodTracingMode();
/**
@@ -354,7 +333,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void stopMethodTracing();
/**
@@ -372,7 +350,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@FastNative
public static native long threadCpuTimeNanos();
@@ -382,7 +359,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void startAllocCounting();
/**
@@ -391,7 +367,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void stopAllocCounting();
/**
@@ -403,7 +378,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native int getAllocCount(int kind);
/**
@@ -414,7 +388,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void resetAllocCount(int kinds);
/**
@@ -477,7 +450,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@FastNative
public static native void printLoadedClasses(int flags);
@@ -489,7 +461,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@FastNative
public static native int getLoadedClassCount();
@@ -506,7 +477,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void dumpHprofData(String filename) throws IOException {
if (filename == null) {
throw new NullPointerException("filename == null");
@@ -523,7 +493,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void dumpHprofDataDdms();
/**
@@ -538,7 +507,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void dumpHprofData(String fileName, FileDescriptor fd)
throws IOException {
dumpHprofData(fileName, fd != null ? fd.getInt$() : -1);
@@ -555,7 +523,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void dumpReferenceTables();
/**
@@ -573,7 +540,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native long countInstancesOfClass(Class klass, boolean assignable);
/**
@@ -593,7 +559,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native long[] countInstancesOfClasses(Class[] classes, boolean assignable);
/**
@@ -641,7 +606,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static String getRuntimeStat(String statName) {
if (statName == null) {
throw new NullPointerException("statName == null");
@@ -662,7 +626,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static Map<String, String> getRuntimeStats() {
HashMap<String, String> map = new HashMap<>();
String[] values = getRuntimeStatsInternal();
@@ -688,7 +651,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void attachAgent(String agent, ClassLoader classLoader) throws IOException {
nativeAttachAgent(agent, classLoader);
}
@@ -719,6 +681,5 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void setAllocTrackerStackDepth(int stackDepth);
}
diff --git a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
index a17a257..f42ae30 100644
--- a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
+++ b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
@@ -36,7 +36,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class ZygoteHooks {
private static long token;
private static Method enableMemoryMappedDataMethod;
@@ -52,7 +51,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void startZygoteNoThreadCreation();
/**
@@ -61,7 +59,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void onBeginPreload() {
com.android.i18n.system.ZygoteHooks.onBeginPreload();
@@ -87,7 +84,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void onEndPreload() {
com.android.i18n.system.ZygoteHooks.onEndPreload();
@@ -105,7 +101,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void gcAndFinalize() {
final VMRuntime runtime = VMRuntime.getRuntime();
@@ -124,7 +119,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void stopZygoteNoThreadCreation();
/**
@@ -137,7 +131,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void preFork() {
Daemons.stop();
token = nativePreFork();
@@ -153,7 +146,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void postForkSystemServer(int runtimeFlags) {
nativePostForkSystemServer(runtimeFlags);
}
@@ -170,7 +162,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void postForkChild(int runtimeFlags, boolean isSystemServer,
boolean isChildZygote, String instructionSet) {
nativePostForkChild(token, runtimeFlags, isSystemServer, isChildZygote, instructionSet);
@@ -196,7 +187,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void postForkCommon() {
// Notify the runtime before creating new threads.
nativePostZygoteFork();
@@ -214,7 +204,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static boolean isIndefiniteThreadSuspensionSafe() {
return nativeZygoteLongSuspendOk();
}
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 38b4113..2317614 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
@@ -32,7 +32,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public class Chunk {
/**
@@ -41,7 +40,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public int type; // chunk type
/**
* @hide
@@ -75,7 +73,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public Chunk(int type, byte[] data, int offset, int length) {
this.type = type;
this.data = data;
@@ -94,7 +91,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public Chunk(int type, ByteBuffer buf) {
this.type = type;
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 fe936d5..4e8c763 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
@@ -32,7 +32,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public abstract class ChunkHandler {
/**
@@ -42,7 +41,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final ByteOrder CHUNK_ORDER = ByteOrder.BIG_ENDIAN;
/**
@@ -56,7 +54,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public ChunkHandler() {}
/**
@@ -66,7 +63,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public abstract void onConnected();
/**
@@ -76,7 +72,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public abstract void onDisconnected();
/**
@@ -91,7 +86,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public abstract Chunk handleChunk(Chunk request);
/**
@@ -105,7 +99,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static Chunk createFailChunk(int errorCode, String msg) {
if (msg == null)
msg = "";
@@ -131,7 +124,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static ByteBuffer wrapChunk(Chunk request) {
ByteBuffer in;
@@ -146,7 +138,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static int type(String typeName) {
if (typeName.length() != 4) {
throw new IllegalArgumentException("Bad type name: " + typeName);
@@ -164,7 +155,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static String name(int type)
{
char[] ascii = new char[4];
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 1465641..110fe51 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
@@ -34,7 +34,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class DdmServer {
private static HashMap<Integer,ChunkHandler> mHandlerMap =
@@ -65,7 +64,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void registerHandler(int type, ChunkHandler handler) {
if (handler == null) {
throw new NullPointerException("handler == null");
@@ -87,7 +85,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static ChunkHandler unregisterHandler(int type) {
synchronized (mHandlerMap) {
return mHandlerMap.remove(type);
@@ -101,7 +98,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void registrationComplete() {
// sync on mHandlerMap because it's convenient and makes a kind of
// sense
@@ -123,7 +119,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void sendChunk(Chunk chunk) {
nativeSendChunk(chunk.type, chunk.data, chunk.offset, chunk.length);
}
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 8aca688..1aebf6f 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
@@ -27,7 +27,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class DdmVmInternal {
/* do not instantiate */
@@ -43,7 +42,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
native public static void setThreadNotifyEnabled(boolean enabled);
/**
@@ -74,6 +72,5 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
native public static void setRecentAllocationsTrackingEnabled(boolean enabled);
}
diff --git a/json/src/main/java/org/json/JSONObject.java b/json/src/main/java/org/json/JSONObject.java
index c7a881d..d4b4548 100644
--- a/json/src/main/java/org/json/JSONObject.java
+++ b/json/src/main/java/org/json/JSONObject.java
@@ -683,7 +683,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@NonNull public Set<@NonNull String> keySet() {
return nameValuePairs.keySet();
}
diff --git a/libart/src/main/java/dalvik/system/AnnotatedStackTraceElement.java b/libart/src/main/java/dalvik/system/AnnotatedStackTraceElement.java
index cce747d..1936822 100644
--- a/libart/src/main/java/dalvik/system/AnnotatedStackTraceElement.java
+++ b/libart/src/main/java/dalvik/system/AnnotatedStackTraceElement.java
@@ -30,7 +30,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class AnnotatedStackTraceElement {
/**
* The traditional StackTraceElement describing the Java stack frame.
@@ -61,7 +60,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@NonNull public StackTraceElement getStackTraceElement() {
return stackTraceElement;
}
@@ -75,7 +73,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@Nullable public Object[] getHeldLocks() {
return heldLocks;
}
@@ -90,7 +87,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@Nullable public Object getBlockedOn() {
return blockedOn;
}
diff --git a/libart/src/main/java/dalvik/system/VMRuntime.java b/libart/src/main/java/dalvik/system/VMRuntime.java
index 2b5d8cd..065d73c 100644
--- a/libart/src/main/java/dalvik/system/VMRuntime.java
+++ b/libart/src/main/java/dalvik/system/VMRuntime.java
@@ -27,8 +27,6 @@
import dalvik.annotation.compat.VersionCodes;
import dalvik.annotation.optimization.FastNative;
-import libcore.api.CorePlatformApi;
-
import java.lang.ref.FinalizerReference;
import java.util.HashMap;
import java.util.Map;
@@ -43,7 +41,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public final class VMRuntime {
@@ -108,7 +105,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public interface HiddenApiUsageLogger {
// The following ACCESS_METHOD_ constants must match the values in
@@ -120,7 +116,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int ACCESS_METHOD_NONE = 0;
/**
@@ -129,7 +124,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int ACCESS_METHOD_REFLECTION = 1;
/**
@@ -138,7 +132,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int ACCESS_METHOD_JNI = 2;
/**
@@ -148,7 +141,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int ACCESS_METHOD_LINKING = 3;
/**
@@ -168,7 +160,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public void hiddenApiUsed(int sampledValue, String appPackageName,
String signature, int accessType, boolean accessDenied);
}
@@ -186,7 +177,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setHiddenApiUsageLogger(HiddenApiUsageLogger hiddenApiUsageLogger) {
VMRuntime.hiddenApiUsageLogger = hiddenApiUsageLogger;
}
@@ -211,7 +201,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
// Must match android.os.Build.VERSION_CODES.CUR_DEVELOPMENT.
public static final int SDK_VERSION_CUR_DEVELOPMENT = 10000;
@@ -242,7 +231,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public static VMRuntime getRuntime() {
return THE_ONE;
@@ -286,7 +274,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public native String vmLibrary();
/**
@@ -298,7 +285,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public native String vmInstructionSet();
/**
@@ -310,7 +296,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@FastNative
public native boolean is64Bit();
@@ -323,7 +308,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@FastNative
public native boolean isCheckJniEnabled();
@@ -394,7 +378,6 @@
@UnsupportedAppUsage(maxTargetSdk=0, publicAlternatives="Use the {@code targetSdkVersion}"
+" attribute in the {@code uses-sdk} manifest tag instead.")
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public synchronized void setTargetSdkVersion(int targetSdkVersion) {
this.targetSdkVersion = targetSdkVersion;
setTargetSdkVersionNative(this.targetSdkVersion);
@@ -411,7 +394,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public synchronized void setDisabledCompatChanges(long[] disabledCompatChanges) {
this.disabledCompatChanges = disabledCompatChanges;
setDisabledCompatChangesNative(this.disabledCompatChanges);
@@ -426,7 +408,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public synchronized int getTargetSdkVersion() {
return targetSdkVersion;
}
@@ -533,7 +514,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public native void setHiddenApiExemptions(String[] signaturePrefixes);
/**
@@ -545,7 +525,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public native void setHiddenApiAccessLogSamplingRate(int rate);
/**
@@ -561,7 +540,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
@FastNative
public native Object newNonMovableArray(Class<?> componentType, int length);
@@ -579,7 +557,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@FastNative
public native Object newUnpaddedArray(Class<?> componentType, int minLength);
@@ -594,7 +571,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
@FastNative
public native long addressOf(Object array);
@@ -607,7 +583,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public native void clearGrowthLimit();
/**
@@ -617,7 +592,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public native void clampGrowthLimit();
/**
@@ -628,7 +602,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@FastNative
public native boolean isNativeDebuggable();
@@ -655,7 +628,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public native void registerNativeAllocation(long bytes);
/**
@@ -670,7 +642,6 @@
@UnsupportedAppUsage
@Deprecated
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public void registerNativeAllocation(int bytes) {
registerNativeAllocation((long) bytes);
}
@@ -684,7 +655,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public native void registerNativeFree(long bytes);
/**
@@ -698,7 +668,6 @@
@UnsupportedAppUsage
@Deprecated
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public void registerNativeFree(int bytes) {
registerNativeFree((long) bytes);
}
@@ -774,7 +743,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public native void requestConcurrentGC();
/**
@@ -816,7 +784,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public native void updateProcessState(int state);
/**
@@ -826,7 +793,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public native void notifyStartupCompleted();
/**
@@ -836,7 +802,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public native void preloadDexCaches();
/**
@@ -847,7 +812,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int CODE_PATH_TYPE_PRIMARY_APK = 1 << 0;
/**
* Flag denoting that the code paths passed to
@@ -857,7 +821,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int CODE_PATH_TYPE_SPLIT_APK = 1 << 1;
/**
* Flag denoting that the code paths passed to
@@ -867,7 +830,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int CODE_PATH_TYPE_SECONDARY_DEX = 1 << 2;
/**
@@ -888,7 +850,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void registerAppInfo(
String packageName,
String currentProfileFile,
@@ -909,7 +870,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static String getInstructionSet(String abi) {
final String instructionSet = ABI_TO_INSTRUCTION_SET_MAP.get(abi);
if (instructionSet == null) {
@@ -929,7 +889,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static boolean is64BitInstructionSet(String instructionSet) {
return "arm64".equals(instructionSet) ||
"x86_64".equals(instructionSet) ||
@@ -947,7 +906,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static boolean is64BitAbi(String abi) {
return is64BitInstructionSet(getInstructionSet(abi));
}
@@ -967,7 +925,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void bootCompleted();
/**
@@ -978,7 +935,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void resetJitCounters();
/**
@@ -990,7 +946,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native String getCurrentInstructionSet();
/**
@@ -1000,7 +955,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void registerSensitiveThread();
/**
@@ -1019,7 +973,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setNonSdkApiUsageConsumer(Consumer<String> consumer) {
nonSdkApiUsageConsumer = consumer;
}
@@ -1033,7 +986,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void setDedupeHiddenApiWarnings(boolean dedupe);
/**
@@ -1044,7 +996,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void setProcessPackageName(String packageName);
/**
@@ -1055,7 +1006,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void setProcessDataDirectory(String dataDir);
/**
@@ -1071,6 +1021,5 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native boolean isValidClassLoaderContext(String encodedClassLoaderContext);
}
diff --git a/libart/src/main/java/dalvik/system/VMStack.java b/libart/src/main/java/dalvik/system/VMStack.java
index 9a84f0f..04872bd 100644
--- a/libart/src/main/java/dalvik/system/VMStack.java
+++ b/libart/src/main/java/dalvik/system/VMStack.java
@@ -31,7 +31,6 @@
*
* @hide
*/
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public final class VMStack {
@@ -111,7 +110,6 @@
*
* @hide
*/
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
@FastNative
native public static @Nullable AnnotatedStackTraceElement[]
diff --git a/luni/src/main/java/android/compat/Compatibility.java b/luni/src/main/java/android/compat/Compatibility.java
index 1f2a72b..a64e8e1 100644
--- a/luni/src/main/java/android/compat/Compatibility.java
+++ b/luni/src/main/java/android/compat/Compatibility.java
@@ -21,7 +21,6 @@
import android.annotation.SystemApi;
import android.compat.annotation.ChangeId;
-import libcore.api.CorePlatformApi;
import libcore.api.IntraCoreApi;
import java.util.Collections;
@@ -38,7 +37,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@IntraCoreApi
public final class Compatibility {
@@ -61,7 +59,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@IntraCoreApi
public static void reportUnconditionalChange(@ChangeId long changeId) {
sCallbacks.onChangeReported(changeId);
@@ -84,7 +81,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@IntraCoreApi
public static boolean isChangeEnabled(@ChangeId long changeId) {
return sCallbacks.isChangeEnabled(changeId);
@@ -102,7 +98,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public static void setBehaviorChangeDelegate(BehaviorChangeDelegate callbacks) {
sCallbacks = Objects.requireNonNull(callbacks);
}
@@ -113,7 +108,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public static void clearBehaviorChangeDelegate() {
sCallbacks = DEFAULT_CALLBACKS;
}
@@ -125,7 +119,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public static void setOverrides(ChangeConfig overrides) {
// Setting overrides twice in a row does not need to be supported because
// this method is only for enabling/disabling changes for the duration of
@@ -144,7 +137,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public static void clearOverrides() {
if (!(sCallbacks instanceof OverrideCallbacks)) {
throw new IllegalStateException("No overrides set");
@@ -157,12 +149,11 @@
* to logcat.
*
* This is provided as a class rather than an interface to allow new methods to be added without
- * breaking @CorePlatformApi binary compatibility.
+ * breaking @SystemApi binary compatibility.
*
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public interface BehaviorChangeDelegate {
/**
* Called when a change is reported via {@link Compatibility#reportUnconditionalChange}
@@ -170,7 +161,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
default void onChangeReported(long changeId) {
// Do not use String.format here (b/160912695)
System.logW("No Compatibility callbacks set! Reporting change " + changeId);
@@ -182,7 +172,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
default boolean isChangeEnabled(long changeId) {
// Do not use String.format here (b/160912695)
System.logW("No Compatibility callbacks set! Querying change " + changeId);
@@ -194,7 +183,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@IntraCoreApi
public static final class ChangeConfig {
private final Set<Long> enabled;
@@ -204,7 +192,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@IntraCoreApi
public ChangeConfig(@NonNull Set<@NonNull Long> enabled, @NonNull Set<@NonNull Long> disabled) {
this.enabled = Objects.requireNonNull(enabled);
@@ -227,7 +214,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@IntraCoreApi
public boolean isEmpty() {
return enabled.isEmpty() && disabled.isEmpty();
@@ -246,7 +232,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@IntraCoreApi
public @NonNull long[] getEnabledChangesArray() {
return toLongArray(enabled);
@@ -257,7 +242,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@IntraCoreApi
public @NonNull long[] getDisabledChangesArray() {
return toLongArray(disabled);
@@ -268,7 +252,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@IntraCoreApi
public @NonNull Set<@NonNull Long> getEnabledSet() {
return Collections.unmodifiableSet(enabled);
@@ -279,7 +262,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@IntraCoreApi
public @NonNull Set<@NonNull Long> getDisabledSet() {
return Collections.unmodifiableSet(disabled);
@@ -290,7 +272,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@IntraCoreApi
public boolean isForceEnabled(long changeId) {
return enabled.contains(changeId);
@@ -301,7 +282,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@IntraCoreApi
public boolean isForceDisabled(long changeId) {
return disabled.contains(changeId);
diff --git a/luni/src/main/java/android/system/NetlinkSocketAddress.java b/luni/src/main/java/android/system/NetlinkSocketAddress.java
index ecccfa3..27db766 100644
--- a/luni/src/main/java/android/system/NetlinkSocketAddress.java
+++ b/luni/src/main/java/android/system/NetlinkSocketAddress.java
@@ -52,7 +52,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class NetlinkSocketAddress extends SocketAddress {
/**
* port ID
@@ -93,7 +92,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public NetlinkSocketAddress(int nlPortId, int nlGroupsMask) {
this.nlPortId = nlPortId;
this.nlGroupsMask = nlGroupsMask;
@@ -107,7 +105,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public int getPortId() {
return nlPortId;
}
@@ -120,7 +117,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public int getGroupsMask() {
return nlGroupsMask;
}
diff --git a/luni/src/main/java/android/system/Os.java b/luni/src/main/java/android/system/Os.java
index 9beb8786..3977eb1 100755
--- a/luni/src/main/java/android/system/Os.java
+++ b/luni/src/main/java/android/system/Os.java
@@ -85,7 +85,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static @Nullable StructCapUserData[] capget(@NonNull StructCapUserHeader hdr) throws ErrnoException {
return Libcore.os.capget(hdr);
}
@@ -109,7 +108,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void capset(@NonNull StructCapUserHeader hdr, @NonNull StructCapUserData[] data)
throws ErrnoException {
Libcore.os.capset(hdr, data);
@@ -259,7 +257,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static int getpgid(int pid) throws ErrnoException { return Libcore.os.getpgid(pid); }
/**
@@ -290,7 +287,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static @Nullable StructRlimit getrlimit(int resource) throws ErrnoException { return Libcore.os.getrlimit(resource); }
/**
@@ -322,7 +318,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static int getsockoptInt(@NonNull FileDescriptor fd, int level, int option) throws ErrnoException { return Libcore.os.getsockoptInt(fd, level, option); }
/**
@@ -343,7 +338,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static @Nullable StructLinger getsockoptLinger(@NonNull FileDescriptor fd, int level, int option) throws ErrnoException { return Libcore.os.getsockoptLinger(fd, level, option); }
/**
@@ -405,7 +399,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static int ioctlInt(@NonNull FileDescriptor fd, int cmd) throws ErrnoException {
return Libcore.os.ioctlInt(fd, cmd);
}
@@ -526,7 +519,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static @Nullable FileDescriptor[] pipe2(int flags) throws ErrnoException { return Libcore.os.pipe2(flags); }
/**
@@ -603,7 +595,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public static @Nullable String realpath(@Nullable String path) throws ErrnoException { return Libcore.os.realpath(path); }
@@ -719,7 +710,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setpgid(int pid, int pgid) throws ErrnoException { Libcore.os.setpgid(pid, pgid); }
/**
@@ -736,7 +726,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setregid(int rgid, int egid) throws ErrnoException { Libcore.os.setregid(rgid, egid); }
/**
@@ -753,7 +742,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setreuid(int ruid, int euid) throws ErrnoException { Libcore.os.setreuid(ruid, euid); }
/**
@@ -785,7 +773,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setsockoptIfreq(@NonNull FileDescriptor fd, int level, int option, @Nullable String value) throws ErrnoException { Libcore.os.setsockoptIfreq(fd, level, option, value); }
/**
@@ -813,7 +800,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setsockoptLinger(@NonNull FileDescriptor fd, int level, int option, @NonNull StructLinger value) throws ErrnoException { Libcore.os.setsockoptLinger(fd, level, option, value); }
/**
@@ -910,7 +896,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static long splice(@NonNull FileDescriptor fdIn, @Nullable Int64Ref offIn, @NonNull FileDescriptor fdOut, @Nullable Int64Ref offOut, long len, int flags) throws ErrnoException { return Libcore.os.splice(fdIn, offIn, fdOut, offOut, len, flags); }
/**
@@ -980,7 +965,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void unlink(@Nullable String pathname) throws ErrnoException { Libcore.os.unlink(pathname); }
/**
diff --git a/luni/src/main/java/android/system/OsConstants.java b/luni/src/main/java/android/system/OsConstants.java
index 2c09edb..18fee90 100644
--- a/luni/src/main/java/android/system/OsConstants.java
+++ b/luni/src/main/java/android/system/OsConstants.java
@@ -40,7 +40,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static int CAP_TO_INDEX(int x) { return x >>> 5; }
/**
@@ -55,7 +54,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static int CAP_TO_MASK(int x) { return 1 << (x & 31); }
/**
@@ -191,7 +189,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int ARPHRD_LOOPBACK = placeholder();
public static final int CAP_AUDIT_CONTROL = placeholder();
public static final int CAP_AUDIT_WRITE = placeholder();
@@ -332,7 +329,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int EUSERS = placeholder();
// On Linux, EWOULDBLOCK == EAGAIN. Use EAGAIN instead, to reduce confusion.
public static final int EXDEV = placeholder();
@@ -429,7 +425,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int _LINUX_CAPABILITY_VERSION_3 = placeholder();
public static final int MAP_FIXED = placeholder();
public static final int MAP_ANONYMOUS = placeholder();
@@ -442,7 +437,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int MAP_POPULATE = placeholder();
public static final int MAP_PRIVATE = placeholder();
public static final int MAP_SHARED = placeholder();
@@ -499,7 +493,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int O_DIRECT = placeholder();
public static final int O_EXCL = placeholder();
public static final int O_NOCTTY = placeholder();
@@ -531,7 +524,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int PR_CAP_AMBIENT = placeholder();
/**
* The capability specified in {@code arg3} of {@link Os#prctl(int, long, long, long, long)}
@@ -544,7 +536,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int PR_CAP_AMBIENT_RAISE = placeholder();
public static final int PR_GET_DUMPABLE = placeholder();
public static final int PR_SET_DUMPABLE = placeholder();
@@ -568,7 +559,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int RLIMIT_NOFILE = placeholder();
public static final int RT_SCOPE_HOST = placeholder();
public static final int RT_SCOPE_LINK = placeholder();
@@ -585,7 +575,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int RTMGRP_IPV4_IFADDR = placeholder();
/** @hide */
@UnsupportedAppUsage
@@ -734,7 +723,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int SPLICE_F_MOVE = placeholder();
/** @hide */
@UnsupportedAppUsage
@@ -752,7 +740,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int SPLICE_F_MORE = placeholder();
public static final int STDERR_FILENO = placeholder();
public static final int STDIN_FILENO = placeholder();
@@ -802,7 +789,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int TIOCOUTQ = placeholder();
/**
* Sockopt option to encapsulate ESP packets in UDP.
@@ -811,7 +797,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int UDP_ENCAP = placeholder();
/** @hide */
@UnsupportedAppUsage
@@ -819,7 +804,6 @@
/** @hide */
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int UDP_ENCAP_ESPINUDP = placeholder();
/** @hide */
@UnsupportedAppUsage
@@ -842,7 +826,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int XATTR_CREATE = placeholder();
/**
* {@code flags} option for {@link Os#setxattr(String, String, byte[], int)}.
@@ -856,7 +839,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int XATTR_REPLACE = placeholder();
public static final int X_OK = placeholder();
public static final int _SC_2_CHAR_TERM = placeholder();
diff --git a/luni/src/main/java/android/system/PacketSocketAddress.java b/luni/src/main/java/android/system/PacketSocketAddress.java
index dca8d06..2d421c3 100644
--- a/luni/src/main/java/android/system/PacketSocketAddress.java
+++ b/luni/src/main/java/android/system/PacketSocketAddress.java
@@ -34,7 +34,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class PacketSocketAddress extends SocketAddress {
/**
* Protocol. An Ethernet protocol type, e.g., {@link OsConstants#ETH_P_IPV6}.
@@ -99,7 +98,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public PacketSocketAddress(int sll_protocol, int sll_ifindex, byte[] sll_addr) {
this.sll_protocol = sll_protocol;
this.sll_ifindex = sll_ifindex;
diff --git a/luni/src/main/java/android/system/StructCapUserData.java b/luni/src/main/java/android/system/StructCapUserData.java
index a4aa87c..c159140 100644
--- a/luni/src/main/java/android/system/StructCapUserData.java
+++ b/luni/src/main/java/android/system/StructCapUserData.java
@@ -32,7 +32,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class StructCapUserData {
/**
* Effective capability mask.
@@ -40,7 +39,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final int effective; /* __u32 */
/**
@@ -49,7 +47,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final int permitted; /* __u32 */
/**
@@ -58,7 +55,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final int inheritable; /* __u32 */
/**
@@ -71,7 +67,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public StructCapUserData(int effective, int permitted, int inheritable) {
this.effective = effective;
this.permitted = permitted;
diff --git a/luni/src/main/java/android/system/StructCapUserHeader.java b/luni/src/main/java/android/system/StructCapUserHeader.java
index 249313a..664e244 100644
--- a/luni/src/main/java/android/system/StructCapUserHeader.java
+++ b/luni/src/main/java/android/system/StructCapUserHeader.java
@@ -31,7 +31,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class StructCapUserHeader {
/**
* Version of the header. Note this is not final as capget() may mutate the field when an
@@ -61,7 +60,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public StructCapUserHeader(int version, int pid) {
this.version = version;
this.pid = pid;
diff --git a/luni/src/main/java/android/system/StructLinger.java b/luni/src/main/java/android/system/StructLinger.java
index c7f5ff9..40fc21f 100644
--- a/luni/src/main/java/android/system/StructLinger.java
+++ b/luni/src/main/java/android/system/StructLinger.java
@@ -41,7 +41,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class StructLinger {
/**
* Whether or not linger is enabled. Non-zero is on.
@@ -56,7 +55,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final int l_linger;
/**
@@ -69,7 +67,6 @@
*/
@SuppressWarnings("NewApi") // False positive lint limitation, see b/177434707.
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public StructLinger(int l_onoff, int l_linger) {
this.l_onoff = l_onoff;
this.l_linger = l_linger;
@@ -84,7 +81,6 @@
*/
@SuppressWarnings("NewApi") // False positive lint limitation, see b/177434707.
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public boolean isOn() {
return l_onoff != 0;
}
diff --git a/luni/src/main/java/android/system/StructRlimit.java b/luni/src/main/java/android/system/StructRlimit.java
index b35c075..c7620ab 100644
--- a/luni/src/main/java/android/system/StructRlimit.java
+++ b/luni/src/main/java/android/system/StructRlimit.java
@@ -31,7 +31,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class StructRlimit {
/**
@@ -40,7 +39,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final long rlim_cur;
/**
* Hard limit (ceiling for rlim_cur)
diff --git a/luni/src/main/java/android/system/UnixSocketAddress.java b/luni/src/main/java/android/system/UnixSocketAddress.java
index 3a7c822..a949e01 100644
--- a/luni/src/main/java/android/system/UnixSocketAddress.java
+++ b/luni/src/main/java/android/system/UnixSocketAddress.java
@@ -34,7 +34,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class UnixSocketAddress extends SocketAddress {
private static final int NAMED_PATH_LENGTH = OsConstants.UNIX_PATH_MAX;
@@ -92,7 +91,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static UnixSocketAddress createFileSystem(String pathName) {
byte[] pathNameBytes = pathName.getBytes(StandardCharsets.UTF_8);
// File system sockets have a path that ends with (byte) 0.
diff --git a/luni/src/main/java/android/system/VmSocketAddress.java b/luni/src/main/java/android/system/VmSocketAddress.java
index 1ff85bd..33b5527 100644
--- a/luni/src/main/java/android/system/VmSocketAddress.java
+++ b/luni/src/main/java/android/system/VmSocketAddress.java
@@ -21,8 +21,6 @@
import android.annotation.SystemApi;
import java.net.SocketAddress;
-import libcore.api.CorePlatformApi;
-import libcore.util.Objects;
/**
* A virtio-vsock address {@link VmSocketAddress}.
@@ -42,7 +40,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public final class VmSocketAddress extends SocketAddress {
/**
* sockaddr_vm::svmPort, see {@code struct sockaddr_vm} in
@@ -67,7 +64,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public VmSocketAddress(int svmPort, int svmCid) {
this.svmPort = svmPort;
this.svmCid = svmCid;
@@ -79,7 +75,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public int getSvmPort() {
return svmPort;
}
@@ -90,7 +85,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public int getSvmCid() {
return svmCid;
}
diff --git a/luni/src/main/java/java/nio/NIOAccess.java b/luni/src/main/java/java/nio/NIOAccess.java
index 13968fb..4c1b006 100644
--- a/luni/src/main/java/java/nio/NIOAccess.java
+++ b/luni/src/main/java/java/nio/NIOAccess.java
@@ -29,7 +29,6 @@
*/
// @VisibleForTesting : was default
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class NIOAccess {
private NIOAccess() {}
@@ -61,7 +60,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static Object getBaseArray(Buffer b) {
return b.hasArray() ? b.array() : null;
}
@@ -80,7 +78,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static int getBaseArrayOffset(Buffer b) {
return b.hasArray() ? ((b.arrayOffset() + b.position) << b._elementSizeShift) : 0;
}
diff --git a/luni/src/main/java/java/nio/NioUtils.java b/luni/src/main/java/java/nio/NioUtils.java
index cfac508..c2660b9 100644
--- a/luni/src/main/java/java/nio/NioUtils.java
+++ b/luni/src/main/java/java/nio/NioUtils.java
@@ -36,7 +36,6 @@
* @hide internal use only
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class NioUtils {
private NioUtils() {
}
@@ -50,7 +49,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void freeDirectBuffer(ByteBuffer buffer) {
if (buffer == null) {
return;
@@ -98,7 +96,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static byte[] unsafeArray(ByteBuffer b) {
return b.array();
}
@@ -114,7 +111,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static int unsafeArrayOffset(ByteBuffer b) {
return b.arrayOffset();
}
diff --git a/luni/src/main/java/libcore/content/type/MimeMap.java b/luni/src/main/java/libcore/content/type/MimeMap.java
index fcd08ec..55eff4a 100644
--- a/luni/src/main/java/libcore/content/type/MimeMap.java
+++ b/luni/src/main/java/libcore/content/type/MimeMap.java
@@ -29,7 +29,6 @@
import java.util.Objects;
import java.util.Set;
import java.util.function.Supplier;
-import libcore.api.CorePlatformApi;
import libcore.util.NonNull;
import libcore.util.Nullable;
@@ -39,7 +38,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public final class MimeMap {
/**
@@ -52,7 +50,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public static @NonNull Builder builder() {
return new Builder();
}
@@ -68,7 +65,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public @NonNull Builder buildUpon() {
return new Builder(mimeToExt, extToMime);
}
@@ -115,7 +111,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public static @NonNull MimeMap getDefault() {
return Objects.requireNonNull(instanceSupplier.get());
}
@@ -134,7 +129,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public static void setDefaultSupplier(@NonNull Supplier<@NonNull MimeMap> mimeMapSupplier) {
instanceSupplier = new MemoizingSupplier<>(Objects.requireNonNull(mimeMapSupplier));
}
@@ -149,7 +143,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public final boolean hasExtension(@Nullable String extension) {
return guessMimeTypeFromExtension(extension) != null;
}
@@ -165,7 +158,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public final @Nullable String guessMimeTypeFromExtension(@Nullable String extension) {
if (extension == null) {
return null;
@@ -184,7 +176,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public final boolean hasMimeType(@Nullable String mimeType) {
return guessExtensionFromMimeType(mimeType) != null;
}
@@ -200,7 +191,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public final @Nullable String guessExtensionFromMimeType(@Nullable String mimeType) {
if (mimeType == null) {
return null;
@@ -219,7 +209,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public @NonNull Set<String> mimeTypes() {
return Collections.unmodifiableSet(mimeToExt.keySet());
}
@@ -235,7 +224,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public @NonNull Set<String> extensions() {
return Collections.unmodifiableSet(extToMime.keySet());
}
@@ -294,7 +282,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public static final class Builder {
private final Map<String, String> mimeToExt;
private final Map<String, String> extToMime;
@@ -399,7 +386,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public @NonNull Builder addMimeMapping(@NonNull String mimeSpec, @NonNull List<@NonNull String> extensionSpecs)
{
Element mimeElement = Element.ofMimeSpec(mimeSpec); // validate mimeSpec unconditionally
@@ -433,7 +419,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public @NonNull MimeMap build() {
return new MimeMap(mimeToExt, extToMime);
}
diff --git a/luni/src/main/java/libcore/io/ForwardingOs.java b/luni/src/main/java/libcore/io/ForwardingOs.java
index 8320be0..fd5655d 100755
--- a/luni/src/main/java/libcore/io/ForwardingOs.java
+++ b/luni/src/main/java/libcore/io/ForwardingOs.java
@@ -58,7 +58,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public class ForwardingOs implements Os {
@UnsupportedAppUsage
private final Os os;
@@ -72,7 +71,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
protected ForwardingOs(@NonNull Os os) {
this.os = Objects.requireNonNull(os);
}
@@ -123,7 +121,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
/**
* @hide
@@ -563,7 +560,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public FileDescriptor open(@Nullable String path, int flags, int mode) throws ErrnoException { return os.open(path, flags, mode); }
/**
@@ -674,7 +670,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public void remove(@Nullable String path) throws ErrnoException { os.remove(path); }
/**
@@ -700,7 +695,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public void rename(@Nullable String oldPath, @Nullable String newPath) throws ErrnoException { os.rename(oldPath, newPath); }
/**
@@ -849,7 +843,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public @Nullable StructStat stat(@Nullable String path) throws ErrnoException { return os.stat(path); }
/**
@@ -927,7 +920,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public void unlink(@Nullable String pathname) throws ErrnoException { os.unlink(pathname); }
/**
diff --git a/luni/src/main/java/libcore/io/IoBridge.java b/luni/src/main/java/libcore/io/IoBridge.java
index 99babfc..541e187 100644
--- a/luni/src/main/java/libcore/io/IoBridge.java
+++ b/luni/src/main/java/libcore/io/IoBridge.java
@@ -95,7 +95,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class IoBridge {
private IoBridge() {
@@ -294,7 +293,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void closeAndSignalBlockedThreads(@NonNull FileDescriptor fd) throws IOException {
if (fd == null) {
return;
@@ -556,7 +554,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static @NonNull FileDescriptor open(@NonNull String path, int flags) throws FileNotFoundException {
FileDescriptor fd = null;
try {
@@ -598,7 +595,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static int read(@NonNull FileDescriptor fd, @NonNull byte[] bytes, int byteOffset, int byteCount) throws IOException {
ArrayUtils.throwsIfOutOfBounds(bytes.length, byteOffset, byteCount);
if (byteCount == 0) {
@@ -640,7 +636,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void write(@NonNull FileDescriptor fd,@NonNull byte[] bytes, int byteOffset, int byteCount) throws IOException {
ArrayUtils.throwsIfOutOfBounds(bytes.length, byteOffset, byteCount);
if (byteCount == 0) {
diff --git a/luni/src/main/java/libcore/io/IoUtils.java b/luni/src/main/java/libcore/io/IoUtils.java
index 6820868..d5ddf94 100644
--- a/luni/src/main/java/libcore/io/IoUtils.java
+++ b/luni/src/main/java/libcore/io/IoUtils.java
@@ -43,7 +43,6 @@
/** @hide */
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class IoUtils {
private IoUtils() {
}
@@ -65,7 +64,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static int acquireRawFd(@NonNull FileDescriptor fd) {
Objects.requireNonNull(fd);
@@ -151,7 +149,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setFdOwner(@NonNull FileDescriptor fd, @NonNull Object owner) {
Objects.requireNonNull(fd);
Objects.requireNonNull(owner);
@@ -179,7 +176,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void close(@Nullable FileDescriptor fd) throws IOException {
IoBridge.closeAndSignalBlockedThreads(fd);
}
@@ -193,7 +189,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void closeQuietly(@Nullable AutoCloseable closeable) {
if (closeable != null) {
try {
@@ -214,7 +209,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void closeQuietly(@Nullable FileDescriptor fd) {
try {
IoUtils.close(fd);
@@ -231,7 +225,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void closeQuietly(@Nullable Socket socket) {
if (socket != null) {
try {
@@ -254,7 +247,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setBlocking(@NonNull FileDescriptor fd, boolean blocking) throws IOException {
try {
int flags = Libcore.os.fcntlVoid(fd, F_GETFL);
@@ -280,7 +272,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static @NonNull byte[] readFileAsByteArray(@NonNull String absolutePath) throws IOException {
return new FileReader(absolutePath).readFully().toByteArray();
}
@@ -296,7 +287,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static @NonNull String readFileAsString(@NonNull String absolutePath) throws IOException {
return new FileReader(absolutePath).readFully().toString(StandardCharsets.UTF_8);
}
diff --git a/luni/src/main/java/libcore/io/Memory.java b/luni/src/main/java/libcore/io/Memory.java
index ac8ccb9..efd3ac5 100644
--- a/luni/src/main/java/libcore/io/Memory.java
+++ b/luni/src/main/java/libcore/io/Memory.java
@@ -26,7 +26,6 @@
import dalvik.annotation.optimization.FastNative;
-import libcore.api.CorePlatformApi;
import libcore.util.NonNull;
/**
@@ -34,7 +33,6 @@
*
* @hide
*/
-@CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public final class Memory {
private Memory() { }
@@ -67,7 +65,6 @@
*
* @hide
*/
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public static int peekInt(@NonNull byte[] src, int offset, @NonNull ByteOrder order) {
if (order == ByteOrder.BIG_ENDIAN) {
@@ -121,7 +118,6 @@
*
* @hide
*/
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public static short peekShort(@NonNull byte[] src, int offset, @NonNull ByteOrder order) {
if (order == ByteOrder.BIG_ENDIAN) {
@@ -142,7 +138,6 @@
*
* @hide
*/
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public static void pokeInt(@NonNull byte[] dst, int offset, int value, @NonNull ByteOrder order) {
if (order == ByteOrder.BIG_ENDIAN) {
@@ -169,7 +164,6 @@
*
* @hide
*/
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public static void pokeLong(@NonNull byte[] dst, int offset, long value, @NonNull ByteOrder order) {
if (order == ByteOrder.BIG_ENDIAN) {
@@ -208,7 +202,6 @@
*
* @hide
*/
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public static void pokeShort(@NonNull byte[] dst, int offset, short value, @NonNull ByteOrder order) {
if (order == ByteOrder.BIG_ENDIAN) {
@@ -239,7 +232,6 @@
*
* @hide make type-safe before making public?
*/
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public static native void memmove(@NonNull Object dstObject, int dstOffset, @NonNull Object srcObject, int srcOffset, long byteCount);
diff --git a/luni/src/main/java/libcore/io/Os.java b/luni/src/main/java/libcore/io/Os.java
index 0c58455..092de59 100755
--- a/luni/src/main/java/libcore/io/Os.java
+++ b/luni/src/main/java/libcore/io/Os.java
@@ -59,7 +59,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public interface Os {
/**
@@ -790,7 +789,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static boolean compareAndSetDefault(Os expect, Os update) {
return Libcore.compareAndSetOs(expect, update);
}
@@ -801,7 +799,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static Os getDefault() {
return Libcore.getOs();
}
diff --git a/luni/src/main/java/libcore/io/Streams.java b/luni/src/main/java/libcore/io/Streams.java
index 6002118..457a36f 100644
--- a/luni/src/main/java/libcore/io/Streams.java
+++ b/luni/src/main/java/libcore/io/Streams.java
@@ -39,7 +39,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class Streams {
private static AtomicReference<byte[]> skipBuffer = new AtomicReference<byte[]>();
@@ -58,7 +57,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static int readSingleByte(@NonNull InputStream in) throws IOException {
byte[] buffer = new byte[1];
int result = in.read(buffer, 0, 1);
@@ -78,7 +76,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void writeSingleByte(@NonNull OutputStream out, int b) throws IOException {
byte[] buffer = new byte[1];
buffer[0] = (byte) (b & 0xff);
@@ -97,7 +94,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void readFully(@NonNull InputStream in, @NonNull byte[] dst) throws IOException {
readFully(in, dst, 0, dst.length);
}
@@ -143,7 +139,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static @NonNull byte[] readFully(@NonNull InputStream in) throws IOException {
try {
return readFullyNoClose(in);
@@ -163,7 +158,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static @NonNull byte[] readFullyNoClose(@NonNull InputStream in) throws IOException {
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
byte[] buffer = new byte[1024];
@@ -184,7 +178,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static @NonNull String readFully(@NonNull Reader reader) throws IOException {
try {
StringWriter writer = new StringWriter();
@@ -229,7 +222,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static long skipByReading(@NonNull InputStream in, long byteCount) throws IOException {
// acquire the shared skip buffer.
byte[] buffer = skipBuffer.getAndSet(null);
@@ -269,7 +261,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static int copy(@NonNull InputStream in, @NonNull OutputStream out) throws IOException {
int total = 0;
byte[] buffer = new byte[8192];
diff --git a/luni/src/main/java/libcore/net/InetAddressUtils.java b/luni/src/main/java/libcore/net/InetAddressUtils.java
index a3860b5..b3b7297 100644
--- a/luni/src/main/java/libcore/net/InetAddressUtils.java
+++ b/luni/src/main/java/libcore/net/InetAddressUtils.java
@@ -35,7 +35,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public class InetAddressUtils {
private static final int NETID_UNSET = 0;
@@ -59,7 +58,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static boolean isNumericAddress(String address) {
return parseNumericAddressNoThrow(address) != null;
}
@@ -80,7 +78,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static InetAddress parseNumericAddress(String address) {
InetAddress result = parseNumericAddressNoThrow(address);
if (result == null) {
diff --git a/luni/src/main/java/libcore/net/NetworkSecurityPolicy.java b/luni/src/main/java/libcore/net/NetworkSecurityPolicy.java
index ab4678e..aa7cde0 100644
--- a/luni/src/main/java/libcore/net/NetworkSecurityPolicy.java
+++ b/luni/src/main/java/libcore/net/NetworkSecurityPolicy.java
@@ -35,7 +35,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public abstract class NetworkSecurityPolicy {
@@ -49,7 +48,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public NetworkSecurityPolicy() {
}
@@ -62,7 +60,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public static NetworkSecurityPolicy getInstance() {
return instance;
@@ -76,7 +73,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setInstance(NetworkSecurityPolicy policy) {
if (policy == null) {
throw new NullPointerException("policy == null");
@@ -109,7 +105,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public abstract boolean isCleartextTrafficPermitted();
/**
@@ -125,7 +120,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public abstract boolean isCleartextTrafficPermitted(String hostname);
/**
@@ -142,7 +136,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public abstract boolean isCertificateTransparencyVerificationRequired(String hostname);
diff --git a/luni/src/main/java/libcore/net/event/NetworkEventDispatcher.java b/luni/src/main/java/libcore/net/event/NetworkEventDispatcher.java
index 4324a61..eb57545 100644
--- a/luni/src/main/java/libcore/net/event/NetworkEventDispatcher.java
+++ b/luni/src/main/java/libcore/net/event/NetworkEventDispatcher.java
@@ -29,7 +29,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class NetworkEventDispatcher {
private static final NetworkEventDispatcher instance = new NetworkEventDispatcher();
@@ -46,7 +45,6 @@
*/
@UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static NetworkEventDispatcher getInstance() {
return instance;
}
@@ -90,7 +88,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public void dispatchNetworkConfigurationChange() {
for (NetworkEventListener listener : listeners) {
try {
diff --git a/luni/src/main/java/libcore/net/http/Dns.java b/luni/src/main/java/libcore/net/http/Dns.java
index a5bb423..9f1de62 100644
--- a/luni/src/main/java/libcore/net/http/Dns.java
+++ b/luni/src/main/java/libcore/net/http/Dns.java
@@ -20,8 +20,6 @@
import android.annotation.SystemApi;
-import libcore.api.CorePlatformApi;
-
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.List;
@@ -33,7 +31,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public interface Dns extends com.android.okhttp.internalandroidapi.Dns {
/**
* Returns the IP addresses of {@code hostname}, in the order they should
@@ -44,6 +41,5 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@NonNull List<@NonNull InetAddress> lookup(@Nullable String hostname) throws UnknownHostException;
}
\ No newline at end of file
diff --git a/luni/src/main/java/libcore/net/http/HttpURLConnectionFactory.java b/luni/src/main/java/libcore/net/http/HttpURLConnectionFactory.java
index 9a713bd..98d06dd 100644
--- a/luni/src/main/java/libcore/net/http/HttpURLConnectionFactory.java
+++ b/luni/src/main/java/libcore/net/http/HttpURLConnectionFactory.java
@@ -20,8 +20,6 @@
import android.annotation.SystemApi;
-import libcore.api.CorePlatformApi;
-
import java.io.IOException;
import java.net.Proxy;
import java.net.URL;
@@ -39,7 +37,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public class HttpURLConnectionFactory {
private final com.android.okhttp.internalandroidapi.HttpURLConnectionFactory mFactory;
@@ -49,7 +46,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
@NonNull public static HttpURLConnectionFactory createInstance() {
return new HttpURLConnectionFactory();
}
@@ -69,7 +65,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public void setNewConnectionPool(int maxIdleConnections, long keepAliveDuration,
@NonNull TimeUnit timeUnit) {
mFactory.setNewConnectionPool(maxIdleConnections, keepAliveDuration, timeUnit);
@@ -83,7 +78,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public void setDns(@NonNull Dns dns) {
mFactory.setDns(dns);
}
@@ -102,7 +96,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @CorePlatformApi(status = CorePlatformApi.Status.STABLE)
public URLConnection openConnection(@NonNull URL url, @NonNull SocketFactory socketFactory,
@NonNull Proxy proxy) throws IOException {
return mFactory.openConnection(url, socketFactory, proxy);
diff --git a/luni/src/main/java/libcore/util/EmptyArray.java b/luni/src/main/java/libcore/util/EmptyArray.java
index f34fe02..aa6a6fd 100644
--- a/luni/src/main/java/libcore/util/EmptyArray.java
+++ b/luni/src/main/java/libcore/util/EmptyArray.java
@@ -27,20 +27,17 @@
*
* @hide
*/
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public final class EmptyArray {
private EmptyArray() {}
/** @hide */
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public static final @NonNull boolean[] BOOLEAN = new boolean[0];
/** @hide */
@UnsupportedAppUsage(maxTargetSdk=VersionCodes.Q,
publicAlternatives="Use {@code new byte[0]} instead.")
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public static final @NonNull byte[] BYTE = new byte[0];
@@ -51,21 +48,18 @@
public static final double[] DOUBLE = new double[0];
/** @hide */
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public static final @NonNull float[] FLOAT = new float[0];
/** @hide */
@UnsupportedAppUsage(maxTargetSdk=VersionCodes.Q,
publicAlternatives="Use {@code new int[0]} instead.")
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public static final @NonNull int[] INT = new int[0];
/** @hide */
@UnsupportedAppUsage(maxTargetSdk=VersionCodes.Q,
publicAlternatives="Use {@code new long[0]} instead.")
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public static final @NonNull long[] LONG = new long[0];
@@ -75,12 +69,10 @@
/** @hide */
@UnsupportedAppUsage(maxTargetSdk=VersionCodes.Q,
publicAlternatives="Use {@code new Object[0]} instead.")
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public static final @NonNull Object[] OBJECT = new Object[0];
/** @hide */
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public static final @NonNull String[] STRING = new String[0];
diff --git a/luni/src/main/java/libcore/util/FP16.java b/luni/src/main/java/libcore/util/FP16.java
index d5a78ed..09a2e76 100644
--- a/luni/src/main/java/libcore/util/FP16.java
+++ b/luni/src/main/java/libcore/util/FP16.java
@@ -91,7 +91,6 @@
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final class FP16 {
/**
* The number of bits used to represent a half-precision float value.
@@ -99,7 +98,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int SIZE = 16;
/**
@@ -109,7 +107,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final short EPSILON = (short) 0x1400;
/**
@@ -118,7 +115,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int MAX_EXPONENT = 15;
/**
* Minimum exponent a normalized half-precision float may have.
@@ -126,7 +122,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int MIN_EXPONENT = -14;
/**
@@ -135,7 +130,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final short LOWEST_VALUE = (short) 0xfbff;
/**
* Maximum positive finite value a half-precision float may have.
@@ -143,7 +137,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final short MAX_VALUE = (short) 0x7bff;
/**
* Smallest positive normal value a half-precision float may have.
@@ -151,7 +144,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final short MIN_NORMAL = (short) 0x0400;
/**
* Smallest positive non-zero value a half-precision float may have.
@@ -159,7 +151,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final short MIN_VALUE = (short) 0x0001;
/**
* A Not-a-Number representation of a half-precision float.
@@ -167,7 +158,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final short NaN = (short) 0x7e00;
/**
* Negative infinity of type half-precision float.
@@ -175,7 +165,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final short NEGATIVE_INFINITY = (short) 0xfc00;
/**
* Negative 0 of type half-precision float.
@@ -183,7 +172,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final short NEGATIVE_ZERO = (short) 0x8000;
/**
* Positive infinity of type half-precision float.
@@ -191,7 +179,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final short POSITIVE_INFINITY = (short) 0x7c00;
/**
* Positive 0 of type half-precision float.
@@ -199,7 +186,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final short POSITIVE_ZERO = (short) 0x0000;
/**
@@ -208,7 +194,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int SIGN_SHIFT = 15;
/**
@@ -217,7 +202,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int EXPONENT_SHIFT = 10;
/**
@@ -226,7 +210,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int SIGN_MASK = 0x8000;
/**
@@ -235,7 +218,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int SHIFTED_EXPONENT_MASK = 0x1f;
/**
@@ -244,7 +226,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int SIGNIFICAND_MASK = 0x3ff;
/**
@@ -253,7 +234,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int EXPONENT_SIGNIFICAND_MASK = 0x7fff;
/**
@@ -262,7 +242,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final int EXPONENT_BIAS = 15;
private static final int FP32_SIGN_SHIFT = 31;
@@ -299,7 +278,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static int compare(short x, short y) {
if (less(x, y)) return -1;
if (greater(x, y)) return 1;
@@ -332,7 +310,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static short rint(short h) {
int bits = h & 0xffff;
int abs = bits & EXPONENT_SIGNIFICAND_MASK;
@@ -378,7 +355,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static short ceil(short h) {
int bits = h & 0xffff;
int abs = bits & EXPONENT_SIGNIFICAND_MASK;
@@ -422,7 +398,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static short floor(short h) {
int bits = h & 0xffff;
int abs = bits & EXPONENT_SIGNIFICAND_MASK;
@@ -464,7 +439,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static short trunc(short h) {
int bits = h & 0xffff;
int abs = bits & EXPONENT_SIGNIFICAND_MASK;
@@ -496,7 +470,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static short min(short x, short y) {
if (isNaN(x)) return NaN;
if (isNaN(y)) return NaN;
@@ -525,7 +498,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static short max(short x, short y) {
if (isNaN(x)) return NaN;
if (isNaN(y)) return NaN;
@@ -551,7 +523,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static boolean less(short x, short y) {
if (isNaN(x)) return false;
if (isNaN(y)) return false;
@@ -573,7 +544,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static boolean lessEquals(short x, short y) {
if (isNaN(x)) return false;
if (isNaN(y)) return false;
@@ -595,7 +565,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static boolean greater(short x, short y) {
if (isNaN(x)) return false;
if (isNaN(y)) return false;
@@ -617,7 +586,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static boolean greaterEquals(short x, short y) {
if (isNaN(x)) return false;
if (isNaN(y)) return false;
@@ -639,7 +607,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static boolean equals(short x, short y) {
if (isNaN(x)) return false;
if (isNaN(y)) return false;
@@ -658,7 +625,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static boolean isInfinite(short h) {
return (h & EXPONENT_SIGNIFICAND_MASK) == POSITIVE_INFINITY;
}
@@ -673,7 +639,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static boolean isNaN(short h) {
return (h & EXPONENT_SIGNIFICAND_MASK) > POSITIVE_INFINITY;
}
@@ -691,7 +656,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static boolean isNormalized(short h) {
return (h & POSITIVE_INFINITY) != 0 && (h & POSITIVE_INFINITY) != POSITIVE_INFINITY;
}
@@ -714,7 +678,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static float toFloat(short h) {
int bits = h & 0xffff;
int s = bits & SIGN_MASK;
@@ -772,7 +735,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static short toHalf(float f) {
int bits = Float.floatToRawIntBits(f);
int s = (bits >>> FP32_SIGN_SHIFT );
@@ -855,7 +817,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static String toHexString(short h) {
StringBuilder o = new StringBuilder();
diff --git a/luni/src/main/java/libcore/util/HexEncoding.java b/luni/src/main/java/libcore/util/HexEncoding.java
index 5edcb20..7404896 100644
--- a/luni/src/main/java/libcore/util/HexEncoding.java
+++ b/luni/src/main/java/libcore/util/HexEncoding.java
@@ -25,7 +25,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public class HexEncoding {
private static final char[] LOWER_CASE_DIGITS = {
@@ -50,7 +49,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static String encodeToString(byte b, boolean upperCase) {
char[] digits = upperCase ? UPPER_CASE_DIGITS : LOWER_CASE_DIGITS;
char[] buf = new char[2]; // We always want two digits.
@@ -68,7 +66,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static char[] encode(byte[] data) {
return encode(data, 0, data.length, true /* upperCase */);
}
@@ -84,7 +81,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static char[] encode(byte[] data, boolean upperCase) {
return encode(data, 0, data.length, upperCase);
}
@@ -100,7 +96,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static char[] encode(byte[] data, int offset, int len) {
return encode(data, offset, len, true /* upperCase */);
}
@@ -130,7 +125,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static String encodeToString(byte[] data) {
return encodeToString(data, true /* upperCase */);
}
@@ -146,7 +140,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static String encodeToString(byte[] data, boolean upperCase) {
return new String(encode(data, upperCase));
}
@@ -163,7 +156,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static byte[] decode(String encoded) throws IllegalArgumentException {
return decode(encoded.toCharArray());
}
@@ -182,7 +174,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static byte[] decode(String encoded, boolean allowSingleChar)
throws IllegalArgumentException {
return decode(encoded.toCharArray(), allowSingleChar);
@@ -200,7 +191,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static byte[] decode(char[] encoded) throws IllegalArgumentException {
return decode(encoded, false);
}
@@ -219,7 +209,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static byte[] decode(char[] encoded, boolean allowSingleChar)
throws IllegalArgumentException {
int encodedLength = encoded.length;
diff --git a/luni/src/main/java/libcore/util/NativeAllocationRegistry.java b/luni/src/main/java/libcore/util/NativeAllocationRegistry.java
index e336525..d176390 100644
--- a/luni/src/main/java/libcore/util/NativeAllocationRegistry.java
+++ b/luni/src/main/java/libcore/util/NativeAllocationRegistry.java
@@ -47,7 +47,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public class NativeAllocationRegistry {
@@ -86,7 +85,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static NativeAllocationRegistry createNonmalloced(
@NonNull ClassLoader classLoader, long freeFunction, long size) {
return new NativeAllocationRegistry(classLoader, freeFunction, size, false);
@@ -117,7 +115,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static NativeAllocationRegistry createMalloced(
@NonNull ClassLoader classLoader, long freeFunction, long size) {
return new NativeAllocationRegistry(classLoader, freeFunction, size, true);
@@ -137,7 +134,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public static NativeAllocationRegistry createMalloced(
@NonNull ClassLoader classLoader, long freeFunction) {
@@ -211,7 +207,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public NativeAllocationRegistry(@NonNull ClassLoader classLoader, long freeFunction, long size) {
this(classLoader, freeFunction, size, size == 0);
}
@@ -251,7 +246,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public @NonNull Runnable registerNativeAllocation(@NonNull Object referent, long nativePtr) {
if (referent == null) {
@@ -346,7 +340,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static native void applyFreeFunction(long freeFunction, long nativePtr);
}
diff --git a/luni/src/main/java/libcore/util/SneakyThrow.java b/luni/src/main/java/libcore/util/SneakyThrow.java
index 5a347d9..94582a1 100644
--- a/luni/src/main/java/libcore/util/SneakyThrow.java
+++ b/luni/src/main/java/libcore/util/SneakyThrow.java
@@ -30,7 +30,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public class SneakyThrow {
private SneakyThrow() {
@@ -45,7 +44,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void sneakyThrow(@NonNull Throwable t) {
SneakyThrow.<RuntimeException>sneakyThrow_(t);
}
diff --git a/luni/src/main/java/libcore/util/XmlObjectFactory.java b/luni/src/main/java/libcore/util/XmlObjectFactory.java
index 7a1d7ec..fe13075 100644
--- a/luni/src/main/java/libcore/util/XmlObjectFactory.java
+++ b/luni/src/main/java/libcore/util/XmlObjectFactory.java
@@ -33,7 +33,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public class XmlObjectFactory {
private XmlObjectFactory() {}
@@ -47,7 +46,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static @NonNull XmlSerializer newXmlSerializer() {
return new KXmlSerializer();
}
@@ -61,7 +59,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static @NonNull XmlPullParser newXmlPullParser() {
return new KXmlParser();
}
@@ -74,7 +71,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static @NonNull XMLReader newXMLReader() {
return new ExpatReader();
}
diff --git a/mmodules/intracoreapi/api/intra/current.txt b/mmodules/intracoreapi/api/intra/current.txt
index 72e395b..c11e542 100644
--- a/mmodules/intracoreapi/api/intra/current.txt
+++ b/mmodules/intracoreapi/api/intra/current.txt
@@ -1,20 +1,20 @@
// Signature format: 2.0
package android.compat {
- @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public final class Compatibility {
- method @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public static boolean isChangeEnabled(long);
- method @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public static void reportUnconditionalChange(long);
+ @libcore.api.IntraCoreApi public final class Compatibility {
+ method @libcore.api.IntraCoreApi public static boolean isChangeEnabled(long);
+ method @libcore.api.IntraCoreApi public static void reportUnconditionalChange(long);
}
- @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public static final class Compatibility.ChangeConfig {
- ctor @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public Compatibility.ChangeConfig(@NonNull java.util.Set<java.lang.Long>, @NonNull java.util.Set<java.lang.Long>);
- method @NonNull @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public long[] getDisabledChangesArray();
- method @NonNull @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public java.util.Set<java.lang.Long> getDisabledSet();
- method @NonNull @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public long[] getEnabledChangesArray();
- method @NonNull @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public java.util.Set<java.lang.Long> getEnabledSet();
- method @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public boolean isEmpty();
- method @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public boolean isForceDisabled(long);
- method @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public boolean isForceEnabled(long);
+ @libcore.api.IntraCoreApi public static final class Compatibility.ChangeConfig {
+ ctor @libcore.api.IntraCoreApi public Compatibility.ChangeConfig(@NonNull java.util.Set<java.lang.Long>, @NonNull java.util.Set<java.lang.Long>);
+ method @NonNull @libcore.api.IntraCoreApi public long[] getDisabledChangesArray();
+ method @NonNull @libcore.api.IntraCoreApi public java.util.Set<java.lang.Long> getDisabledSet();
+ method @NonNull @libcore.api.IntraCoreApi public long[] getEnabledChangesArray();
+ method @NonNull @libcore.api.IntraCoreApi public java.util.Set<java.lang.Long> getEnabledSet();
+ method @libcore.api.IntraCoreApi public boolean isEmpty();
+ method @libcore.api.IntraCoreApi public boolean isForceDisabled(long);
+ method @libcore.api.IntraCoreApi public boolean isForceEnabled(long);
}
}
@@ -22,7 +22,7 @@
package android.system {
public final class Os {
- method @Nullable @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public static String realpath(@Nullable String) throws android.system.ErrnoException;
+ method @Nullable @libcore.api.IntraCoreApi public static String realpath(@Nullable String) throws android.system.ErrnoException;
}
}
@@ -42,7 +42,7 @@
package dalvik.annotation.optimization {
- @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.METHOD) @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public @interface FastNative {
+ @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.METHOD) @libcore.api.IntraCoreApi public @interface FastNative {
}
@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) @libcore.api.IntraCoreApi public @interface ReachabilitySensitive {
@@ -52,25 +52,25 @@
package dalvik.system {
- @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public final class BlockGuard {
- method @NonNull @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public static dalvik.system.BlockGuard.Policy getThreadPolicy();
+ @libcore.api.IntraCoreApi public final class BlockGuard {
+ method @NonNull @libcore.api.IntraCoreApi public static dalvik.system.BlockGuard.Policy getThreadPolicy();
}
- @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public static interface BlockGuard.Policy {
+ @libcore.api.IntraCoreApi public static interface BlockGuard.Policy {
method @libcore.api.IntraCoreApi public void onNetwork();
}
- @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public final class CloseGuard {
- method @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public void close();
- method @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public static dalvik.system.CloseGuard get();
- method @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public void open(String);
- method @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public void warnIfOpen();
+ @libcore.api.IntraCoreApi public final class CloseGuard {
+ method @libcore.api.IntraCoreApi public void close();
+ method @libcore.api.IntraCoreApi public static dalvik.system.CloseGuard get();
+ method @libcore.api.IntraCoreApi public void open(String);
+ method @libcore.api.IntraCoreApi public void warnIfOpen();
}
- @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public final class VMRuntime {
- method @dalvik.annotation.optimization.FastNative @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public long addressOf(Object);
- method @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public static dalvik.system.VMRuntime getRuntime();
- method @dalvik.annotation.optimization.FastNative @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public Object newNonMovableArray(Class<?>, int);
+ @libcore.api.IntraCoreApi public final class VMRuntime {
+ method @dalvik.annotation.optimization.FastNative @libcore.api.IntraCoreApi public long addressOf(Object);
+ method @libcore.api.IntraCoreApi public static dalvik.system.VMRuntime getRuntime();
+ method @dalvik.annotation.optimization.FastNative @libcore.api.IntraCoreApi public Object newNonMovableArray(Class<?>, int);
}
}
@@ -126,19 +126,19 @@
package libcore.net {
- @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public abstract class NetworkSecurityPolicy {
- ctor @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public NetworkSecurityPolicy();
- method @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public static libcore.net.NetworkSecurityPolicy getInstance();
- method @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public abstract boolean isCertificateTransparencyVerificationRequired(String);
+ @libcore.api.IntraCoreApi public abstract class NetworkSecurityPolicy {
+ ctor @libcore.api.IntraCoreApi public NetworkSecurityPolicy();
+ method @libcore.api.IntraCoreApi public static libcore.net.NetworkSecurityPolicy getInstance();
+ method @libcore.api.IntraCoreApi public abstract boolean isCertificateTransparencyVerificationRequired(String);
}
}
package libcore.util {
- @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public class NativeAllocationRegistry {
- method @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public static libcore.util.NativeAllocationRegistry createMalloced(@NonNull ClassLoader, long);
- method @NonNull @libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE) @libcore.api.IntraCoreApi public Runnable registerNativeAllocation(@NonNull Object, long);
+ @libcore.api.IntraCoreApi public class NativeAllocationRegistry {
+ method @libcore.api.IntraCoreApi public static libcore.util.NativeAllocationRegistry createMalloced(@NonNull ClassLoader, long);
+ method @NonNull @libcore.api.IntraCoreApi public Runnable registerNativeAllocation(@NonNull Object, long);
}
@java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.TYPE_USE}) @libcore.api.IntraCoreApi public @interface NonNull {
diff --git a/ojluni/annotations/README b/ojluni/annotations/README
index 15d9738..7b5c4d4 100644
--- a/ojluni/annotations/README
+++ b/ojluni/annotations/README
@@ -33,7 +33,7 @@
2. make openjdk-mmodule-stubs-no-javadoc
3. FILES="your/package/and/Class.java another/package/AnotherClass.java"; for FILE in $FILES; do mkdir -p libcore/ojluni/annotations/mmodule/$(dirname ${FILE}) && unzip out/soong/.intermediates/libcore/openjdk-mmodule-stubs-no-javadoc/android_common/metalava/openjdk-mmodule-stubs-no-javadoc-stubs.srcjar ${FILE} && mv ${FILE} libcore/ojluni/annotations/mmodule/${FILE/%.java/.annotated.java}; done
4. Add @libcore.api.Hide to each class, methods and fields in the new files. This will prevent it from being added to the public API. A JavaDoc @hide tag will not work as metalava will ignore javadoc from the stub files.
- 5. Add @libcore.api.CorePlatformApi and @libcore.api.IntraCoreApi as desired
+ 5. Add @android.annotation.SystemApi(client = MODULE_LIBRARIES) and @libcore.api.IntraCoreApi as desired
to the classes and members.
- To see the effect of the files under this directory:
1. make make core-platform-api-stubs core-intra-stubs
diff --git a/ojluni/annotations/mmodule/java/io/FileDescriptor.annotated.java b/ojluni/annotations/mmodule/java/io/FileDescriptor.annotated.java
index cc16cd6..af283d9 100644
--- a/ojluni/annotations/mmodule/java/io/FileDescriptor.annotated.java
+++ b/ojluni/annotations/mmodule/java/io/FileDescriptor.annotated.java
@@ -37,11 +37,9 @@
public native void sync() throws java.io.SyncFailedException;
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public int getInt$() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public void setInt$(int fd) { throw new RuntimeException("Stub!"); }
public long getOwnerId$() { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/annotations/mmodule/java/io/FileInputStream.annotated.java b/ojluni/annotations/mmodule/java/io/FileInputStream.annotated.java
index ac26aeb..7c10ad7 100644
--- a/ojluni/annotations/mmodule/java/io/FileInputStream.annotated.java
+++ b/ojluni/annotations/mmodule/java/io/FileInputStream.annotated.java
@@ -39,7 +39,6 @@
public FileInputStream(java.io.FileDescriptor fdObj) { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public FileInputStream(java.io.FileDescriptor fdObj, boolean isFdOwner) { throw new RuntimeException("Stub!"); }
public int read() throws java.io.IOException { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/annotations/mmodule/java/lang/Thread.annotated.java b/ojluni/annotations/mmodule/java/lang/Thread.annotated.java
index 8308a99..3b1ebe4 100644
--- a/ojluni/annotations/mmodule/java/lang/Thread.annotated.java
+++ b/ojluni/annotations/mmodule/java/lang/Thread.annotated.java
@@ -142,11 +142,9 @@
public static java.lang.Thread.UncaughtExceptionHandler getDefaultUncaughtExceptionHandler() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void setUncaughtExceptionPreHandler(UncaughtExceptionHandler eh) { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static UncaughtExceptionHandler getUncaughtExceptionPreHandler() { throw new RuntimeException("Stub!"); }
public java.lang.Thread.UncaughtExceptionHandler getUncaughtExceptionHandler() { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/annotations/mmodule/java/net/DatagramSocket.annotated.java b/ojluni/annotations/mmodule/java/net/DatagramSocket.annotated.java
index 52b5bff..4d4e8e4 100644
--- a/ojluni/annotations/mmodule/java/net/DatagramSocket.annotated.java
+++ b/ojluni/annotations/mmodule/java/net/DatagramSocket.annotated.java
@@ -104,7 +104,6 @@
public static synchronized void setDatagramSocketImplFactory(java.net.DatagramSocketImplFactory fac) throws java.io.IOException { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public java.io.FileDescriptor getFileDescriptor$() { throw new RuntimeException("Stub!"); }
}
diff --git a/ojluni/annotations/mmodule/java/net/Inet4Address.annotated.java b/ojluni/annotations/mmodule/java/net/Inet4Address.annotated.java
index 4692b1f..bf01c2a 100644
--- a/ojluni/annotations/mmodule/java/net/Inet4Address.annotated.java
+++ b/ojluni/annotations/mmodule/java/net/Inet4Address.annotated.java
@@ -63,17 +63,14 @@
public boolean equals(java.lang.Object obj) { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final java.net.InetAddress ALL;
static { ALL = null; }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final java.net.InetAddress ANY;
static { ANY = null; }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final java.net.InetAddress LOOPBACK;
static { LOOPBACK = null; }
}
diff --git a/ojluni/annotations/mmodule/java/net/Inet6Address.annotated.java b/ojluni/annotations/mmodule/java/net/Inet6Address.annotated.java
index 567d877..04a66cf 100644
--- a/ojluni/annotations/mmodule/java/net/Inet6Address.annotated.java
+++ b/ojluni/annotations/mmodule/java/net/Inet6Address.annotated.java
@@ -72,12 +72,10 @@
public boolean isIPv4CompatibleAddress() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final java.net.InetAddress ANY;
static { ANY = null; }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final java.net.InetAddress LOOPBACK;
static { LOOPBACK = null; }
}
diff --git a/ojluni/annotations/mmodule/java/net/InetAddress.annotated.java b/ojluni/annotations/mmodule/java/net/InetAddress.annotated.java
index 6229cc9..443541b 100644
--- a/ojluni/annotations/mmodule/java/net/InetAddress.annotated.java
+++ b/ojluni/annotations/mmodule/java/net/InetAddress.annotated.java
@@ -88,23 +88,18 @@
public static java.net.InetAddress getLocalHost() throws java.net.UnknownHostException { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static boolean isNumeric(java.lang.String address) { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static java.net.InetAddress parseNumericAddress(java.lang.String numericAddress) { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static void clearDnsCache() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static java.net.InetAddress getByNameOnNet(java.lang.String host, int netId) throws java.net.UnknownHostException { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static java.net.InetAddress[] getAllByNameOnNet(java.lang.String host, int netId) throws java.net.UnknownHostException { throw new RuntimeException("Stub!"); }
}
diff --git a/ojluni/annotations/mmodule/java/net/InetSocketAddress.annotated.java b/ojluni/annotations/mmodule/java/net/InetSocketAddress.annotated.java
index b2bf439..e121099 100644
--- a/ojluni/annotations/mmodule/java/net/InetSocketAddress.annotated.java
+++ b/ojluni/annotations/mmodule/java/net/InetSocketAddress.annotated.java
@@ -31,7 +31,6 @@
public class InetSocketAddress extends java.net.SocketAddress {
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public InetSocketAddress() { throw new RuntimeException("Stub!"); }
public InetSocketAddress(int port) { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/annotations/mmodule/java/net/ServerSocket.annotated.java b/ojluni/annotations/mmodule/java/net/ServerSocket.annotated.java
index 0bf1fe7..fd09926 100644
--- a/ojluni/annotations/mmodule/java/net/ServerSocket.annotated.java
+++ b/ojluni/annotations/mmodule/java/net/ServerSocket.annotated.java
@@ -53,7 +53,6 @@
public java.net.Socket accept() throws java.io.IOException { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public SocketImpl getImpl() throws SocketException { throw new RuntimeException("Stub!"); }
protected final void implAccept(java.net.Socket s) throws java.io.IOException { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/annotations/mmodule/java/net/Socket.annotated.java b/ojluni/annotations/mmodule/java/net/Socket.annotated.java
index 61014de..4924f10 100644
--- a/ojluni/annotations/mmodule/java/net/Socket.annotated.java
+++ b/ojluni/annotations/mmodule/java/net/Socket.annotated.java
@@ -140,7 +140,6 @@
public void setPerformancePreferences(int connectionTime, int latency, int bandwidth) { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
public java.io.FileDescriptor getFileDescriptor$() { throw new RuntimeException("Stub!"); }
}
diff --git a/ojluni/annotations/mmodule/java/net/SocketImpl.annotated.java b/ojluni/annotations/mmodule/java/net/SocketImpl.annotated.java
index a29ed76..c7e345e 100644
--- a/ojluni/annotations/mmodule/java/net/SocketImpl.annotated.java
+++ b/ojluni/annotations/mmodule/java/net/SocketImpl.annotated.java
@@ -63,7 +63,6 @@
protected java.io.FileDescriptor getFileDescriptor() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public java.io.FileDescriptor getFD$() { throw new RuntimeException("Stub!"); }
protected java.net.InetAddress getInetAddress() { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/annotations/mmodule/java/nio/ByteBuffer.annotated.java b/ojluni/annotations/mmodule/java/nio/ByteBuffer.annotated.java
index 369d0a5..0fbe4d0 100644
--- a/ojluni/annotations/mmodule/java/nio/ByteBuffer.annotated.java
+++ b/ojluni/annotations/mmodule/java/nio/ByteBuffer.annotated.java
@@ -152,7 +152,6 @@
public boolean isAccessible() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public void setAccessible(boolean value) { throw new RuntimeException("Stub!"); }
}
diff --git a/ojluni/annotations/mmodule/java/nio/DirectByteBuffer.annotated.java b/ojluni/annotations/mmodule/java/nio/DirectByteBuffer.annotated.java
index 8031e93..220b7dd 100644
--- a/ojluni/annotations/mmodule/java/nio/DirectByteBuffer.annotated.java
+++ b/ojluni/annotations/mmodule/java/nio/DirectByteBuffer.annotated.java
@@ -30,13 +30,11 @@
@libcore.api.Hide
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SuppressWarnings({"unchecked", "deprecation", "all"})
public class DirectByteBuffer extends java.nio.MappedByteBuffer implements sun.nio.ch.DirectBuffer {
@libcore.api.Hide
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public DirectByteBuffer(int cap, long addr, java.io.FileDescriptor fd, java.lang.Runnable unmapper, boolean isReadOnly) { super(0, 0, 0, 0); throw new RuntimeException("Stub!"); }
@libcore.api.Hide
@@ -56,7 +54,6 @@
@libcore.api.Hide
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final long address() { throw new RuntimeException("Stub!"); }
@libcore.api.Hide
@@ -184,7 +181,6 @@
@libcore.api.Hide
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public final void setAccessible(boolean value) { throw new RuntimeException("Stub!"); }
}
diff --git a/ojluni/annotations/mmodule/java/security/Provider.annotated.java b/ojluni/annotations/mmodule/java/security/Provider.annotated.java
index 3ffe654..6662ec0 100644
--- a/ojluni/annotations/mmodule/java/security/Provider.annotated.java
+++ b/ojluni/annotations/mmodule/java/security/Provider.annotated.java
@@ -107,7 +107,6 @@
public boolean isRegistered() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public synchronized void warmUpServiceProvision() { throw new RuntimeException("Stub!"); }
@SuppressWarnings({"unchecked", "deprecation", "all"})
public static class Service {
diff --git a/ojluni/annotations/mmodule/java/security/Signature.annotated.java b/ojluni/annotations/mmodule/java/security/Signature.annotated.java
index 8aaf5c4..cec7abb 100644
--- a/ojluni/annotations/mmodule/java/security/Signature.annotated.java
+++ b/ojluni/annotations/mmodule/java/security/Signature.annotated.java
@@ -87,7 +87,6 @@
public java.lang.Object clone() throws java.lang.CloneNotSupportedException { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public java.security.SignatureSpi getCurrentSpi() { throw new RuntimeException("Stub!"); }
protected static final int SIGN = 2; // 0x2
diff --git a/ojluni/annotations/mmodule/java/text/DateFormat.annotated.java b/ojluni/annotations/mmodule/java/text/DateFormat.annotated.java
index 12a850e..49272d2 100644
--- a/ojluni/annotations/mmodule/java/text/DateFormat.annotated.java
+++ b/ojluni/annotations/mmodule/java/text/DateFormat.annotated.java
@@ -84,7 +84,6 @@
public static final java.text.DateFormat getInstance() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static final void set24HourTimePref(java.lang.Boolean is24Hour) { throw new RuntimeException("Stub!"); }
public static java.util.Locale[] getAvailableLocales() { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/annotations/mmodule/java/util/LinkedHashMap.annotated.java b/ojluni/annotations/mmodule/java/util/LinkedHashMap.annotated.java
index ada21b1..ef28749 100644
--- a/ojluni/annotations/mmodule/java/util/LinkedHashMap.annotated.java
+++ b/ojluni/annotations/mmodule/java/util/LinkedHashMap.annotated.java
@@ -49,7 +49,6 @@
public void clear() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public java.util.Map.Entry<K,V> eldest() { throw new RuntimeException("Stub!"); }
protected boolean removeEldestEntry(java.util.Map.Entry<K,V> eldest) { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/annotations/mmodule/java/util/zip/ZipEntry.annotated.java b/ojluni/annotations/mmodule/java/util/zip/ZipEntry.annotated.java
index 6c840f7..db001eb 100644
--- a/ojluni/annotations/mmodule/java/util/zip/ZipEntry.annotated.java
+++ b/ojluni/annotations/mmodule/java/util/zip/ZipEntry.annotated.java
@@ -39,7 +39,6 @@
public ZipEntry(java.util.zip.ZipEntry e) { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public long getDataOffset() { throw new RuntimeException("Stub!"); }
public java.lang.String getName() { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/annotations/mmodule/javax/crypto/Cipher.annotated.java b/ojluni/annotations/mmodule/javax/crypto/Cipher.annotated.java
index 220eef6..ac3167a 100644
--- a/ojluni/annotations/mmodule/javax/crypto/Cipher.annotated.java
+++ b/ojluni/annotations/mmodule/javax/crypto/Cipher.annotated.java
@@ -120,7 +120,6 @@
public final void updateAAD(java.nio.ByteBuffer src) { throw new RuntimeException("Stub!"); }
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public javax.crypto.CipherSpi getCurrentSpi() { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/annotations/mmodule/javax/crypto/Mac.annotated.java b/ojluni/annotations/mmodule/javax/crypto/Mac.annotated.java
index 26bbeff..02dedec 100644
--- a/ojluni/annotations/mmodule/javax/crypto/Mac.annotated.java
+++ b/ojluni/annotations/mmodule/javax/crypto/Mac.annotated.java
@@ -76,7 +76,6 @@
public final java.lang.Object clone() throws java.lang.CloneNotSupportedException { throw new RuntimeException("Stub!"); }
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@SystemApi(client = MODULE_LIBRARIES)
public javax.crypto.MacSpi getCurrentSpi() { throw new RuntimeException("Stub!"); }
}
diff --git a/ojluni/annotations/mmodule/javax/net/ssl/HttpsURLConnection.annotated.java b/ojluni/annotations/mmodule/javax/net/ssl/HttpsURLConnection.annotated.java
index 5177ba3..5b65388 100644
--- a/ojluni/annotations/mmodule/javax/net/ssl/HttpsURLConnection.annotated.java
+++ b/ojluni/annotations/mmodule/javax/net/ssl/HttpsURLConnection.annotated.java
@@ -44,7 +44,6 @@
public void setHostnameVerifier(javax.net.ssl.HostnameVerifier v) { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static javax.net.ssl.HostnameVerifier getStrictHostnameVerifier() { throw new RuntimeException("Stub!"); }
public javax.net.ssl.HostnameVerifier getHostnameVerifier() { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/annotations/mmodule/sun/misc/Cleaner.annotated.java b/ojluni/annotations/mmodule/sun/misc/Cleaner.annotated.java
index 06dddd4..6085df7 100644
--- a/ojluni/annotations/mmodule/sun/misc/Cleaner.annotated.java
+++ b/ojluni/annotations/mmodule/sun/misc/Cleaner.annotated.java
@@ -29,7 +29,6 @@
import java.lang.ref.*;
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
@SuppressWarnings({"unchecked", "deprecation", "all"})
public class Cleaner extends java.lang.ref.PhantomReference<java.lang.Object> {
@@ -39,11 +38,9 @@
@libcore.api.Hide
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public static sun.misc.Cleaner create(java.lang.Object ob, java.lang.Runnable thunk) { throw new RuntimeException("Stub!"); }
@libcore.api.Hide
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public void clean() { throw new RuntimeException("Stub!"); }
}
diff --git a/ojluni/annotations/mmodule/sun/misc/Unsafe.annotated.java b/ojluni/annotations/mmodule/sun/misc/Unsafe.annotated.java
index f6e755e..2b83e0f 100644
--- a/ojluni/annotations/mmodule/sun/misc/Unsafe.annotated.java
+++ b/ojluni/annotations/mmodule/sun/misc/Unsafe.annotated.java
@@ -27,7 +27,6 @@
package sun.misc;
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
@SuppressWarnings({"unchecked", "deprecation", "all"})
public final class Unsafe {
@@ -35,23 +34,19 @@
private Unsafe() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public static sun.misc.Unsafe getUnsafe() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public long objectFieldOffset(java.lang.reflect.Field field) { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public int arrayBaseOffset(java.lang.Class clazz) { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public int arrayIndexScale(java.lang.Class clazz) { throw new RuntimeException("Stub!"); }
@@ -83,12 +78,10 @@
public native java.lang.Object getObjectVolatile(java.lang.Object obj, long offset);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native int getInt(java.lang.Object obj, long offset);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native void putInt(java.lang.Object obj, long offset, int newValue);
@@ -96,12 +89,10 @@
public native void putOrderedInt(java.lang.Object obj, long offset, int newValue);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native long getLong(java.lang.Object obj, long offset);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native void putLong(java.lang.Object obj, long offset, long newValue);
@@ -109,12 +100,10 @@
public native void putOrderedLong(java.lang.Object obj, long offset, long newValue);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native java.lang.Object getObject(java.lang.Object obj, long offset);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native void putObject(java.lang.Object obj, long offset, java.lang.Object newValue);
@@ -122,22 +111,18 @@
public native void putOrderedObject(java.lang.Object obj, long offset, java.lang.Object newValue);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native boolean getBoolean(java.lang.Object obj, long offset);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native void putBoolean(java.lang.Object obj, long offset, boolean newValue);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native byte getByte(java.lang.Object obj, long offset);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native void putByte(java.lang.Object obj, long offset, byte newValue);
@@ -154,22 +139,18 @@
public native void putShort(java.lang.Object obj, long offset, short newValue);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native float getFloat(java.lang.Object obj, long offset);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native void putFloat(java.lang.Object obj, long offset, float newValue);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native double getDouble(java.lang.Object obj, long offset);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native void putDouble(java.lang.Object obj, long offset, double newValue);
@@ -198,12 +179,10 @@
public native void setMemory(long address, long bytes, byte value);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native byte getByte(long address);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native void putByte(long address, byte x);
@@ -220,42 +199,34 @@
public native void putChar(long address, char x);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native int getInt(long address);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native void putInt(long address, int x);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native long getLong(long address);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native void putLong(long address, long x);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native float getFloat(long address);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native void putFloat(long address, float x);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native double getDouble(long address);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native void putDouble(long address, double x);
@@ -266,7 +237,6 @@
public native void copyMemoryFromPrimitiveArray(java.lang.Object src, long srcOffset, long dstAddr, long bytes);
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public native void copyMemory(long srcAddr, long dstAddr, long bytes);
diff --git a/ojluni/annotations/mmodule/sun/security/jca/Providers.annotated.java b/ojluni/annotations/mmodule/sun/security/jca/Providers.annotated.java
index 476ebb5..cba2a22 100644
--- a/ojluni/annotations/mmodule/sun/security/jca/Providers.annotated.java
+++ b/ojluni/annotations/mmodule/sun/security/jca/Providers.annotated.java
@@ -32,7 +32,6 @@
import java.security.NoSuchAlgorithmException;
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
@SuppressWarnings({"unchecked", "deprecation", "all"})
public class Providers {
@@ -44,12 +43,10 @@
public static java.security.Provider getSunProvider() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public static java.lang.Object startJarVerification() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public static void stopJarVerification(java.lang.Object obj) { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/annotations/mmodule/sun/security/pkcs/PKCS7.annotated.java b/ojluni/annotations/mmodule/sun/security/pkcs/PKCS7.annotated.java
index 3bb1a66..79143ee 100644
--- a/ojluni/annotations/mmodule/sun/security/pkcs/PKCS7.annotated.java
+++ b/ojluni/annotations/mmodule/sun/security/pkcs/PKCS7.annotated.java
@@ -36,13 +36,11 @@
import sun.security.x509.X500Name;
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
@SuppressWarnings({"unchecked", "deprecation", "all"})
public class PKCS7 {
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public PKCS7(java.io.InputStream in) throws java.io.IOException, sun.security.pkcs.ParsingException { throw new RuntimeException("Stub!"); }
@@ -51,7 +49,6 @@
@libcore.api.Hide
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public PKCS7(byte[] bytes) throws sun.security.pkcs.ParsingException { throw new RuntimeException("Stub!"); }
@libcore.api.Hide
@@ -70,12 +67,10 @@
public sun.security.pkcs.SignerInfo verify(sun.security.pkcs.SignerInfo info, byte[] bytes) throws java.security.NoSuchAlgorithmException, java.security.SignatureException { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public sun.security.pkcs.SignerInfo verify(sun.security.pkcs.SignerInfo info, java.io.InputStream dataInputStream) throws java.io.IOException, java.security.NoSuchAlgorithmException, java.security.SignatureException { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public sun.security.pkcs.SignerInfo[] verify(byte[] bytes) throws java.security.NoSuchAlgorithmException, java.security.SignatureException { throw new RuntimeException("Stub!"); }
@@ -93,14 +88,12 @@
@libcore.api.Hide
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
public java.security.cert.X509Certificate[] getCertificates() { throw new RuntimeException("Stub!"); }
@libcore.api.Hide
public java.security.cert.X509CRL[] getCRLs() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public sun.security.pkcs.SignerInfo[] getSignerInfos() { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/annotations/mmodule/sun/security/pkcs/ParsingException.annotated.java b/ojluni/annotations/mmodule/sun/security/pkcs/ParsingException.annotated.java
index bdc70dc..a93d39c 100644
--- a/ojluni/annotations/mmodule/sun/security/pkcs/ParsingException.annotated.java
+++ b/ojluni/annotations/mmodule/sun/security/pkcs/ParsingException.annotated.java
@@ -33,7 +33,6 @@
package sun.security.pkcs;
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
@SuppressWarnings({"unchecked", "deprecation", "all"})
public class ParsingException extends java.io.IOException {
diff --git a/ojluni/annotations/mmodule/sun/security/pkcs/SignerInfo.annotated.java b/ojluni/annotations/mmodule/sun/security/pkcs/SignerInfo.annotated.java
index 6a85427..46b89c3 100644
--- a/ojluni/annotations/mmodule/sun/security/pkcs/SignerInfo.annotated.java
+++ b/ojluni/annotations/mmodule/sun/security/pkcs/SignerInfo.annotated.java
@@ -33,13 +33,11 @@
import java.io.IOException;
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
@SuppressWarnings({"unchecked", "deprecation", "all"})
public class SignerInfo implements sun.security.util.DerEncoder {
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public SignerInfo() { throw new RuntimeException("Stub!"); }
@@ -65,7 +63,6 @@
public java.security.cert.X509Certificate getCertificate(sun.security.pkcs.PKCS7 block) throws java.io.IOException { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public java.util.ArrayList<java.security.cert.X509Certificate> getCertificateChain(sun.security.pkcs.PKCS7 block) throws java.io.IOException { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/annotations/mmodule/sun/security/util/ObjectIdentifier.annotated.java b/ojluni/annotations/mmodule/sun/security/util/ObjectIdentifier.annotated.java
index 2892b72..b0a2994 100644
--- a/ojluni/annotations/mmodule/sun/security/util/ObjectIdentifier.annotated.java
+++ b/ojluni/annotations/mmodule/sun/security/util/ObjectIdentifier.annotated.java
@@ -27,13 +27,11 @@
package sun.security.util;
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
@SuppressWarnings({"unchecked", "deprecation", "all"})
public final class ObjectIdentifier implements java.io.Serializable {
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public ObjectIdentifier(java.lang.String oid) throws java.io.IOException { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/annotations/mmodule/sun/security/x509/AlgorithmId.annotated.java b/ojluni/annotations/mmodule/sun/security/x509/AlgorithmId.annotated.java
index 0399caa..f403a1b 100644
--- a/ojluni/annotations/mmodule/sun/security/x509/AlgorithmId.annotated.java
+++ b/ojluni/annotations/mmodule/sun/security/x509/AlgorithmId.annotated.java
@@ -28,7 +28,6 @@
package sun.security.x509;
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
@libcore.api.Hide
@SuppressWarnings({"unchecked", "deprecation", "all"})
@@ -39,7 +38,6 @@
public AlgorithmId() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.Hide
public AlgorithmId(sun.security.util.ObjectIdentifier oid) { throw new RuntimeException("Stub!"); }
@@ -63,7 +61,6 @@
public final sun.security.util.ObjectIdentifier getOID() { throw new RuntimeException("Stub!"); }
@android.annotation.SystemApi(client = android.annotation.SystemApi.Client.MODULE_LIBRARIES)
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
@libcore.api.IntraCoreApi
@libcore.api.Hide
public java.lang.String getName() { throw new RuntimeException("Stub!"); }
diff --git a/ojluni/src/main/java/sun/security/pkcs/SignerInfo.java b/ojluni/src/main/java/sun/security/pkcs/SignerInfo.java
index ea12395..73d3ab5 100644
--- a/ojluni/src/main/java/sun/security/pkcs/SignerInfo.java
+++ b/ojluni/src/main/java/sun/security/pkcs/SignerInfo.java
@@ -96,7 +96,7 @@
PKCS9Attributes authenticatedAttributes;
PKCS9Attributes unauthenticatedAttributes;
- // Android-added: No-arg constructor to use in @libcore.api.CorePlatformApi
+ // Android-added: No-arg constructor to use in @SystemApi(client = MODULE_LIBRARIES)
public SignerInfo() {}
public SignerInfo(X500Name issuerName,
diff --git a/openjdk_java_files.bp b/openjdk_java_files.bp
index a9f1dee..09c8a30 100644
--- a/openjdk_java_files.bp
+++ b/openjdk_java_files.bp
@@ -1408,7 +1408,7 @@
// sources, these API annotations can be placed in .annotated.java stub files
// under ojluni/annotations/mmodule. Classes must be hidden using the
// libcore.api.Hide annotation, and then the class and the members to be exposed
-// must be annotated with libcore.api.CorePlatformApi and/or
+// must be annotated with android.annotation.SystemApi and/or
// libcore.api.IntraCoreApi.
filegroup {
name: "openjdk_mmodule_extra_files",