summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--concurrent/src/main/java/java/util/concurrent/Executors.java4
-rw-r--r--dalvik/src/main/java/dalvik/system/VMStack.java1
2 files changed, 3 insertions, 2 deletions
diff --git a/concurrent/src/main/java/java/util/concurrent/Executors.java b/concurrent/src/main/java/java/util/concurrent/Executors.java
index 90cf6ee..a57abe5 100644
--- a/concurrent/src/main/java/java/util/concurrent/Executors.java
+++ b/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<Object> callable(final PrivilegedAction<?> action) {
+ public static Callable<Object> callable(final PrivilegedAction action) {
if (action == null)
throw new NullPointerException();
return new Callable<Object>() {
@@ -374,7 +374,7 @@ public class Executors {
* @return a callable object
* @throws NullPointerException if action null
*/
- public static Callable<Object> callable(final PrivilegedExceptionAction<?> action) {
+ public static Callable<Object> callable(final PrivilegedExceptionAction action) {
if (action == null)
throw new NullPointerException();
return new Callable<Object>() {
diff --git a/dalvik/src/main/java/dalvik/system/VMStack.java b/dalvik/src/main/java/dalvik/system/VMStack.java
index 88d9bcd..365613e 100644
--- a/dalvik/src/main/java/dalvik/system/VMStack.java
+++ b/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();