Revert "Mark stable dalvik.system.VMStack"
This reverts commit 9ceb6744b3f8130fe27a860ee77e1083726a84b1.
Reason for revert: Breaking master branch because 2 CLs merged at the same time, but both causing change in current.txt file.
Bug: 190613446
Change-Id: Ie84aa0c06abdeb044e1db00371f4baa57c704c5d
diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt
index a79183d..6c7128f 100644
--- a/api/module-lib-current.txt
+++ b/api/module-lib-current.txt
@@ -309,10 +309,6 @@
field public static final int ACCESS_METHOD_REFLECTION = 1; // 0x1
}
- public final class VMStack {
- method public static dalvik.system.AnnotatedStackTraceElement[] getAnnotatedThreadStackTrace(Thread);
- }
-
public final class ZygoteHooks {
method public static void gcAndFinalize();
method public static boolean isIndefiniteThreadSuspensionSafe();
diff --git a/libart/src/main/java/dalvik/system/VMStack.java b/libart/src/main/java/dalvik/system/VMStack.java
index ebb7b86..89ce215 100644
--- a/libart/src/main/java/dalvik/system/VMStack.java
+++ b/libart/src/main/java/dalvik/system/VMStack.java
@@ -16,9 +16,6 @@
package dalvik.system;
-import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
-
-import android.annotation.SystemApi;
import android.compat.annotation.UnsupportedAppUsage;
import dalvik.annotation.optimization.FastNative;
@@ -29,8 +26,7 @@
*
* @hide
*/
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
-@SystemApi(client = MODULE_LIBRARIES)
+@libcore.api.CorePlatformApi
public final class VMStack {
private VMStack() {
@@ -44,8 +40,6 @@
* @deprecated Use {@code ClassLoader.getClassLoader(sun.reflect.Reflection.getCallerClass())}.
* Note that that can return {@link BootClassLoader} on Android where the RI
* would have returned null.
- *
- * @hide
*/
@UnsupportedAppUsage
@FastNative
@@ -57,8 +51,6 @@
*
* @return the requested class, or {@code null}.
* @deprecated Use {@link sun.reflect.Reflection#getCallerClass()}.
- *
- * @hide
*/
@Deprecated
public static Class<?> getStackClass1() {
@@ -69,8 +61,6 @@
* Returns the class of the caller's caller's caller.
*
* @return the requested class, or {@code null}.
- *
- * @hide
*/
@UnsupportedAppUsage
@FastNative
@@ -79,8 +69,6 @@
/**
* Returns the first ClassLoader on the call stack that isn't the
* bootstrap class loader.
- *
- * @hide
*/
@FastNative
public native static ClassLoader getClosestUserClassLoader();
@@ -92,8 +80,6 @@
* thread of interest
* @return an array of stack trace elements, or null if the thread
* doesn't have a stack trace (e.g. because it exited)
- *
- * @hide
*/
@UnsupportedAppUsage
@FastNative
@@ -106,11 +92,8 @@
* thread of interest
* @return an array of annotated stack frames, or null if the thread
* doesn't have a stack trace (e.g. because it exited)
- *
- * @hide
*/
- @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
- @SystemApi(client = MODULE_LIBRARIES)
+ @libcore.api.CorePlatformApi
@FastNative
native public static AnnotatedStackTraceElement[]
getAnnotatedThreadStackTrace(Thread t);
@@ -125,8 +108,6 @@
* preallocated array for use when only the top of stack is
* desired. Unused elements will be filled with null values.
* @return the number of elements filled
- *
- * @hide
*/
@UnsupportedAppUsage
@FastNative
diff --git a/mmodules/core_platform_api/api/stable_platform/current.txt b/mmodules/core_platform_api/api/stable_platform/current.txt
index a79183d..6c7128f 100644
--- a/mmodules/core_platform_api/api/stable_platform/current.txt
+++ b/mmodules/core_platform_api/api/stable_platform/current.txt
@@ -309,10 +309,6 @@
field public static final int ACCESS_METHOD_REFLECTION = 1; // 0x1
}
- public final class VMStack {
- method public static dalvik.system.AnnotatedStackTraceElement[] getAnnotatedThreadStackTrace(Thread);
- }
-
public final class ZygoteHooks {
method public static void gcAndFinalize();
method public static boolean isIndefiniteThreadSuspensionSafe();