Commit Graph

46313 Commits

Author SHA1 Message Date
Eric Laurent
c9a7dff0c3 Merge "AudioTrack: relax check on minimum buffer size" 2012-03-06 10:52:18 -08:00
Dianne Hackborn
d8cd73942f Merge "Fix issues #6103378 and #5959515." 2012-03-06 10:34:18 -08:00
James Dong
194774b172 Merge "Remove unused code - MediaSourceSplitter" 2012-03-06 10:23:58 -08:00
James Dong
1aef28cbf9 Merge "There was copy and paste code in JNI to create a DrmConvertedStatus object." 2012-03-06 10:23:51 -08:00
Siva Velusamy
2178dcf149 Merge "gltrace: Send vertex attribute data after glDraw() call." 2012-03-06 08:59:32 -08:00
Alex Sakhartchouk
5100c76b46 Merge "First draft of the sample function implementation." 2012-03-06 08:31:54 -08:00
Glenn Kasten
a440dc1562 Merge "Remove obsolete references to sched_policy.h" 2012-03-06 08:17:43 -08:00
Glenn Kasten
0a57c72933 Merge "Remove references to sched_policy.h" 2012-03-06 08:17:20 -08:00
Derek Sollenberger
e58faabea5 Merge "Add missing includes for Mutex.h" 2012-03-06 05:27:31 -08:00
Daniel Sandler
706342ad42 Merge changes I8343449c,I4eaf69a1
* changes:
  New slide-out mechanism.
  Newly reimplemented PhoneStatusBar, now with fewer windows.
2012-03-06 05:18:10 -08:00
Jeff Brown
975d9cf8f0 Merge "Rename remove callback methods." 2012-03-05 20:38:12 -08:00
Mathias Agopian
757507e3a0 Merge "Add ATRACEs for Buffer indices" 2012-03-05 19:41:29 -08:00
Jeff Brown
643c1d01c9 Merge "Support posting delayed animation/draw callbacks." 2012-03-05 19:05:02 -08:00
Glenn Kasten
4bcb57502c Remove obsolete references to sched_policy.h
As part of scheduling policy cleanup, remove or isolate
all references to the scheduling policy APIs.

Change-Id: Ia1ea2fe711a399039f25217309e061267744b856
2012-03-05 18:12:45 -08:00
Mathias Agopian
12649cab53 Merge "fixup include paths" 2012-03-05 16:08:26 -08:00
Mathias Agopian
622cfadc8f fixup include paths
- remove unneeded include deps
- remove some hardcoded include paths

Change-Id: Ifae0e2b2d738e0f94f8525c45be78f4227ce1673
2012-03-05 15:59:38 -08:00
Nick Pelly
d8b7d456f7 Merge "Clarify docs for the thread used in BroadcastReceiver.onReceive()" 2012-03-05 15:57:13 -08:00
Jeff Brown
0ecfc0387c Merge "Change widgets to post invalidate to the animation timer." 2012-03-05 15:38:47 -08:00
Guang Zhu
ffa4467add Merge "Update to DumpRenderTree test harness" 2012-03-05 15:35:27 -08:00
Gilles Debunne
a61754a309 Merge "EditText caches only text in its internal display list." 2012-03-05 15:22:28 -08:00
Eric Fischer
864d32780b Merge "Import translations. DO NOT MERGE" 2012-03-05 15:18:30 -08:00
Eric Fischer
f96926f5b9 Merge "Import translations. DO NOT MERGE" 2012-03-05 15:18:20 -08:00
Jean-Michel Trivi
98805bf7ee Merge "Add channel mask in AudioSink" 2012-03-05 14:51:54 -08:00
Tom Taylor
5ea4707939 Merge "Remove deleted pdu items from the updated cache" 2012-03-05 14:47:27 -08:00
Scott Main
cd365a8ee9 am 5186f094: am 8b0f6881: am a47d88a7: docs: dashboard update for march 5
* commit '5186f094ba6d37f47ae52085e34dd87267ec41d4':
  docs: dashboard update for march 5
2012-03-05 14:43:11 -08:00
Fabrice Di Meglio
180d116a38 Merge "Fix bug #5815381 [DA] [Android Gallery] [Cut string in "no-response" box]" 2012-03-05 14:40:50 -08:00
Scott Main
8dfeb57ef2 am 8b0f6881: am a47d88a7: docs: dashboard update for march 5
* commit '8b0f688156919cec527bc60df43c527d2dd940dc':
  docs: dashboard update for march 5
2012-03-05 14:39:46 -08:00
Scott Main
d4d5f8e8bb am a47d88a7: docs: dashboard update for march 5
* commit 'a47d88a7d25da74319dc3decf80d98516a85fab2':
  docs: dashboard update for march 5
2012-03-05 14:36:05 -08:00
Jim Miller
013580c27c Merge "Fix 5958806: Allow play button to be hidden in TransportControlView" 2012-03-05 13:50:48 -08:00
Romain Guy
7e17bd0760 Merge "Delete display list objects and resources on the UI thread Bug #6073717 Bug #6065504 Bug #6026515 Bug #5971725" 2012-03-05 13:48:55 -08:00
Jeff Brown
e68e91bf1b Merge "Make SQLiteDatabase final." 2012-03-05 13:38:59 -08:00
Jeff Brown
51c9e44bf1 Merge "Don't log SQLITE_SCHEMA errors." 2012-03-05 13:38:24 -08:00
Fabrice Di Meglio
bd41735e5d Merge "Fix bug #6029615 Update Javadoc for onPaddingChanged()" 2012-03-05 13:36:20 -08:00
Scott Main
5e35ba5eb7 am 7342817e: am afdf856d: am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '7342817ec382ad45dffdf48ad34e0805ed026a2a':
2012-03-05 13:35:05 -08:00
Scott Main
3191c0a5e5 am afdf856d: am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit 'afdf856d432fe5bae56152e42cb2c28ba63a5af0':
2012-03-05 13:32:20 -08:00
Scott Main
e44ea4edc0 am 2814c8be: am 97aa69d3: am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '2814c8be993ddfb2c64b0dcbeb1443427b3fca3d':
  docs: add note about declaring file sizes with sample app's code
2012-03-05 13:30:15 -08:00
Scott Main
10c20275b9 am 97aa69d3: am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '97aa69d32f52499db001970829a0e654564ea551':
  docs: add note about declaring file sizes with sample app's code
2012-03-05 13:27:33 -08:00
Scott Main
bac61a9acc am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '2df6ecc508f6b30fd5d005394effa64272584caa':
  docs: add note about declaring file sizes with sample app's code
2012-03-05 13:26:26 -08:00
Scott Main
5426ffb8bf am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '2df6ecc508f6b30fd5d005394effa64272584caa':
  docs: add note about declaring file sizes with sample app's code
2012-03-05 13:25:54 -08:00
Romain Guy
d0415d07f0 Merge "Deferred layer updates" 2012-03-05 13:20:46 -08:00
Dima Zavin
75657b63b6 Merge "PowerManagerService: only turn off screen when we really mean to" 2012-03-05 13:19:33 -08:00
Glenn Kasten
16165db5d6 Merge "threadLoop merge" 2012-03-05 12:18:14 -08:00
Mathias Agopian
11f05b0113 Merge "BufferQueue: fixed acquire operation" 2012-03-05 12:09:45 -08:00
Scott Main
29f3ddf0e0 am 668f8125: am a7368087: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '668f8125bb7e72780ee204278e4d0da189b8a4b3':
2012-03-05 11:58:52 -08:00
Scott Main
fadf954f56 am a7368087: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit 'a7368087d6f1f2682174139d9cacab48dc7bc198':
2012-03-05 11:56:48 -08:00
Scott Main
4673ff0e85 am 6c4faf74: am 6d2a18b5: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '6c4faf74ae45ebd705620144150acfb677844523':
  docs: updates to OBB guide for naming; plus other edits
2012-03-05 11:56:43 -08:00
Scott Main
8c416dccbc am 6d2a18b5: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '6d2a18b51ee7f7f3aad0b7b76ab55a90900f9403':
  docs: updates to OBB guide for naming; plus other edits
2012-03-05 11:54:36 -08:00
Scott Main
428048b5b5 am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
  docs: updates to OBB guide for naming; plus other edits
2012-03-05 11:52:59 -08:00
Scott Main
63d0b17f25 am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
  docs: updates to OBB guide for naming; plus other edits
2012-03-05 11:52:41 -08:00
Scott Main
f9f509db1e Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1 2012-03-05 11:51:03 -08:00