summaryrefslogtreecommitdiffstats
path: root/libart
diff options
context:
space:
mode:
authorAnwar Ghuloum <anwarg@google.com>2013-07-02 21:54:17 +0000
committerAnwar Ghuloum <anwarg@google.com>2013-07-02 21:54:17 +0000
commit7d37c32dbdcfc4f698bbc72e7d5b8d66bf1c71a9 (patch)
tree830281f03267f9adec793babe5b3cc8f60e63406 /libart
parent1d3779283db9454b5914d522771db37cbba6a4bd (diff)
downloadlibcore-7d37c32dbdcfc4f698bbc72e7d5b8d66bf1c71a9.zip
libcore-7d37c32dbdcfc4f698bbc72e7d5b8d66bf1c71a9.tar.gz
libcore-7d37c32dbdcfc4f698bbc72e7d5b8d66bf1c71a9.tar.bz2
Revert "Rename vmData"
This reverts commit 1d3779283db9454b5914d522771db37cbba6a4bd. Change-Id: I16c998e8c4ee7e9b8e505150d05f2a399df6d066
Diffstat (limited to 'libart')
-rw-r--r--libart/src/main/java/java/lang/Thread.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/libart/src/main/java/java/lang/Thread.java b/libart/src/main/java/java/lang/Thread.java
index 5c81e36..4b28ba1 100644
--- a/libart/src/main/java/java/lang/Thread.java
+++ b/libart/src/main/java/java/lang/Thread.java
@@ -125,7 +125,7 @@ public class Thread implements Runnable {
public static final int NORM_PRIORITY = 5;
/* some of these are accessed directly by the VM; do not rename them */
- private volatile int nativePeer;
+ private volatile int vmData;
volatile ThreadGroup group;
volatile boolean daemon;
volatile String name;
@@ -684,7 +684,7 @@ public class Thread implements Runnable {
* @see Thread#start
*/
public final boolean isAlive() {
- return (nativePeer != 0);
+ return (vmData != 0);
}
/**
@@ -832,7 +832,7 @@ public class Thread implements Runnable {
public final void setDaemon(boolean isDaemon) {
checkNotStarted();
- if (nativePeer == 0) {
+ if (vmData == 0) {
daemon = isDaemon;
}
}