summaryrefslogtreecommitdiffstats
path: root/concurrent/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge change 9014Android (Google) Code Review2009-07-293-13/+6
|\ | | | | | | | | * changes: Fixing some broken links in the concurrent Javadoc.
| * Fixing some broken links in the concurrent Javadoc.Jesse Wilson2009-07-293-13/+6
| | | | | | | | | | | | There's a bug in droiddoc where links to methods with generic parameters don't resolve correctly. I'll open a buganizer issue for this; in the interim I've simply dropped the parameters for the offending links.
* | Fixing Executors to use raw types, which is what RI v5 does.Jesse Wilson2009-07-291-2/+2
|/ | | | Also fixing VMStack to hide the new API method.
* Update concurrent module to Harmony r798021.Jesse Wilson2009-07-2881-7485/+12800
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 56bcdc2a3b881883409267c3bd16294d80716859 Merge: 903691a f429dca Author: Jesse Wilson <jessewilson@google.com> Date: Mon Jul 27 17:33:19 2009 -0700 Merge branch 'concurrent_798021' into concurrent_dalvik Conflicts: libcore/concurrent/.classpath libcore/concurrent/build.xml libcore/concurrent/make/run-test.xml libcore/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java libcore/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java libcore/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java libcore/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java libcore/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java libcore/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java libcore/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java libcore/concurrent/src/main/java/java/util/concurrent/DelayQueue.java libcore/concurrent/src/main/java/java/util/concurrent/LinkedBlockingQueue.java libcore/concurrent/src/main/java/java/util/concurrent/PriorityBlockingQueue.java libcore/concurrent/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java libcore/concurrent/src/main/java/java/util/concurrent/Semaphore.java libcore/concurrent/src/main/java/java/util/concurrent/SynchronousQueue.java libcore/concurrent/src/main/java/java/util/concurrent/ThreadPoolExecutor.java libcore/concurrent/src/main/java/java/util/concurrent/TimeUnit.java libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicBoolean.java libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicInteger.java libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLong.java libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReference.java libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java libcore/concurrent/src/main/java/java/util/concurrent/atomic/package.html libcore/concurrent/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java libcore/concurrent/src/main/java/java/util/concurrent/locks/LockSupport.java libcore/concurrent/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java libcore/concurrent/src/main/java/java/util/concurrent/locks/package.html libcore/concurrent/src/main/java/java/util/concurrent/package.html libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongFieldUpdaterTest.java libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceFieldUpdaterTest.java libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceTest.java libcore/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentHashMapTest.java libcore/concurrent/src/test/java/tests/api/java/util/concurrent/DelayQueueTest.java libcore/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorsTest.java libcore/concurrent/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java libcore/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedBlockingQueueTest.java libcore/concurrent/src/test/java/tests/api/java/util/concurrent/LockSupportTest.java libcore/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantLockTest.java libcore/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantReadWriteLockTest.java commit 903691ae71cff640d5487a3d34a20e8767dbfb66 Author: Jesse Wilson <jessewilson@google.com> Date: Mon Jul 27 16:09:58 2009 -0700 Dalvik Concurrent commit f429dca21c408ee62e688f60d5e110718374e944 Author: Jesse Wilson <jessewilson@google.com> Date: Mon Jul 27 16:08:25 2009 -0700 Concurrent 798021 commit b2c76fdd1056113000140bc4af57300c87469d2d Author: Jesse Wilson <jessewilson@google.com> Date: Mon Jul 27 16:03:45 2009 -0700 Concurrent 527399
* AI 147838: A couple of fixes for making theJorg Pleumann2009-04-271-0/+7
| | | | | | | | | | | | | core tests work better in the CTS environment. Some tests had to be marked broken either because they either expose different behavior than in run-core-tests or they take too much time (beyond the CTS' timeout). BUG=1285921 Automated import of CL 147838
* auto import from //branches/cupcake_rel/...@141571The Android Open Source Project2009-03-191-2/+4
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03105-0/+42944
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03105-42944/+0
|
* auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-092-2/+2
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1767-54/+22461
|
* Initial ContributionThe Android Open Source Project2008-10-2161-0/+20537