commit 5b4be1987233a8b8456c54aba52a01013f220383
author Mathias Agopian <mathias@google.com> Wed May 27 14:34:50 2009 -0700
committer Mathias Agopian <mathias@google.com> Wed May 27 14:34:50 2009 -0700
tree 3f294c0fb421646dcad9c8aba3171969e28503eb
parent 32c7e64b407c1861733d9fa4312ba3bb4713a825
parent a6286c36406f6bb21b53d92dc165c603365b358b

Merge commit 'goog/master' into merge_master

Conflicts:
	include/ui/Rect.h
	libs/ui/ISurfaceComposer.cpp

include/hwbinder/MemoryDealer.h

diff --git a/include/hwbinder/MemoryDealer.h b/include/hwbinder/MemoryDealer.h
index d057556..6628f75 100644
--- a/include/hwbinder/MemoryDealer.h
+++ b/include/hwbinder/MemoryDealer.h
@@ -126,13 +126,22 @@
             mFirst = mLast = newNode;
             newNode->prev = newNode->next = 0;
         } else {
-            insertBefore(mFirst, newNode);
+            newNode->prev = 0;
+            newNode->next = mFirst;
+            mFirst->prev = newNode;
+            mFirst = newNode;
         }
     }
     
     void insertTail(NODE* newNode) {
-        if (mLast == 0) insertBeginning(newNode);
-        else            insertAfter(mLast, newNode);
+        if (mLast == 0) {
+            insertHead(newNode);
+        } else {
+            newNode->prev = mLast;
+            newNode->next = 0;
+            mLast->next = newNode;
+            mLast = newNode;
+        }
     }
 
     NODE* remove(NODE* node) {