From ddb2bfeb6e5a383306159672fe81333bf8520776 Mon Sep 17 00:00:00 2001
From: Jaikumar Ganesh <jaikumar@google.com>
Date: Mon, 23 Aug 2010 17:04:32 -0700
Subject: [PATCH] Revert "Allow reliable detection of a message that is in
 use."

This reverts commit 6083d81ce4d67ec632962270fda64ebb9db0d5b1.
Reverting this because it causes runtime to reboot in a loop
if connected to a Bluetooth Headset.

copyFrom() needs to check for the introduced bit too.
---
 core/java/android/os/Message.java                 | 15 +--------------
 core/java/android/os/MessageQueue.java            |  3 +--
 .../src/android/os/MessageQueueTest.java          |  5 +----
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/core/java/android/os/Message.java b/core/java/android/os/Message.java
index 6d8be77a2c6a6..49b72fee22d3f 100644
--- a/core/java/android/os/Message.java
+++ b/core/java/android/os/Message.java
@@ -74,10 +74,6 @@ public final class Message implements Parcelable {
      */
     public Messenger replyTo;
     
-    /*package*/ static final int FLAG_IN_USE = 1;
-    
-    /*package*/ int flags;
-    
     /*package*/ long when;
     
     /*package*/ Bundle data;
@@ -257,7 +253,6 @@ public final class Message implements Parcelable {
      * target/callback of the original message.
      */
     public void copyFrom(Message o) {
-        this.flags = o.flags;
         this.what = o.what;
         this.arg1 = o.arg1;
         this.arg2 = o.arg2;
@@ -355,7 +350,6 @@ public final class Message implements Parcelable {
     }
 
     /*package*/ void clearForRecycle() {
-        flags = 0;
         what = 0;
         arg1 = 0;
         arg2 = 0;
@@ -367,14 +361,6 @@ public final class Message implements Parcelable {
         data = null;
     }
 
-    /*package*/ boolean isInUse() {
-        return ((flags & FLAG_IN_USE) == FLAG_IN_USE);
-    }
-
-    /*package*/ void markInUse() {
-        flags |= FLAG_IN_USE;
-    }
-
     /** Constructor (but the preferred way to get a Message is to call {@link #obtain() Message.obtain()}).
     */
     public Message() {
@@ -467,3 +453,4 @@ public final class Message implements Parcelable {
         replyTo = Messenger.readMessengerOrNullFromParcel(source);
     }
 }
+
diff --git a/core/java/android/os/MessageQueue.java b/core/java/android/os/MessageQueue.java
index 75dfdd2549605..adb11c82f9878 100644
--- a/core/java/android/os/MessageQueue.java
+++ b/core/java/android/os/MessageQueue.java
@@ -120,7 +120,6 @@ public class MessageQueue {
                 now = SystemClock.uptimeMillis();
                 Message msg = pullNextLocked(now);
                 if (msg != null) {
-                    msg.markInUse();
                     return msg;
                 }
                 
@@ -193,7 +192,7 @@ public class MessageQueue {
     }
 
     final boolean enqueueMessage(Message msg, long when) {
-        if (msg.isInUse()) {
+        if (msg.when != 0) {
             throw new AndroidRuntimeException(msg
                     + " This message is already in use.");
         }
diff --git a/core/tests/coretests/src/android/os/MessageQueueTest.java b/core/tests/coretests/src/android/os/MessageQueueTest.java
index 12931ec39dc39..b7c2d1f1c1495 100644
--- a/core/tests/coretests/src/android/os/MessageQueueTest.java
+++ b/core/tests/coretests/src/android/os/MessageQueueTest.java
@@ -41,10 +41,6 @@ public class MessageQueueTest extends TestCase {
         }
 
         public void handleMessage(Message msg) {
-            if (!msg.isInUse()) {
-                failure(new RuntimeException(
-                        "msg.isInuse is false, should always be true, #" + msg.what));
-            }
             if (mCount <= mLastMessage) {
                 if (msg.what != mCount) {
                     failure(new RuntimeException(
@@ -104,3 +100,4 @@ public class MessageQueueTest extends TestCase {
         tester.doTest(1000);
     }
 }
+