From e4b3060bab84959cf68a9c0202cceb107517d102 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Wed, 29 Jul 2009 11:39:24 -0700 Subject: [PATCH] Fixing Executors to use raw types, which is what RI v5 does. Also fixing VMStack to hide the new API method. --- libcore/concurrent/src/main/java/java/util/concurrent/Executors.java | 4 ++-- libcore/dalvik/src/main/java/dalvik/system/VMStack.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libcore/concurrent/src/main/java/java/util/concurrent/Executors.java b/libcore/concurrent/src/main/java/java/util/concurrent/Executors.java index 90cf6eecf..a57abe5ec 100644 --- a/libcore/concurrent/src/main/java/java/util/concurrent/Executors.java +++ b/libcore/concurrent/src/main/java/java/util/concurrent/Executors.java @@ -359,7 +359,7 @@ public class Executors { * @return a callable object * @throws NullPointerException if action null */ - public static Callable callable(final PrivilegedAction action) { + public static Callable callable(final PrivilegedAction action) { if (action == null) throw new NullPointerException(); return new Callable() { @@ -374,7 +374,7 @@ public class Executors { * @return a callable object * @throws NullPointerException if action null */ - public static Callable callable(final PrivilegedExceptionAction action) { + public static Callable callable(final PrivilegedExceptionAction action) { if (action == null) throw new NullPointerException(); return new Callable() { diff --git a/libcore/dalvik/src/main/java/dalvik/system/VMStack.java b/libcore/dalvik/src/main/java/dalvik/system/VMStack.java index 88d9bcd33..365613eb1 100644 --- a/libcore/dalvik/src/main/java/dalvik/system/VMStack.java +++ b/libcore/dalvik/src/main/java/dalvik/system/VMStack.java @@ -42,6 +42,7 @@ public final class VMStack { /** * Returns the class of the caller's caller's caller. * + * @hide * @return the requested class, or {@code null}. */ native public static Class getStackClass2(); -- 2.11.0