Commit Graph

36909 Commits

Author SHA1 Message Date
Romain Guy
84a6b64982 Merge "Convert looper traces to traceview traces" 2011-07-20 18:47:49 -07:00
Dirk Dougherty
772d47b009 Merge "Cherrypick from hcmr2: doc change: fix typo in reference to new uses-feature constant." 2011-07-20 18:05:56 -07:00
Jeff Brown
05655c9c59 Merge "Untangle MediaScanner error handling. Bug: 5056917" 2011-07-20 18:03:47 -07:00
Gilles Debunne
50ea211fbc Merge "Suggestions are dismissed by back key" 2011-07-20 17:51:36 -07:00
Xavier Ducrohet
63c71e2536 am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp
* commit '84be06e4ce0778fbf0c1ac72f94795ef8433439b':
  Added Caching for PreProcessed PNGs
2011-07-20 17:49:26 -07:00
Eric Laurent
abe4fd279b Merge "Audio framework: support for audio pre processing" 2011-07-20 17:45:37 -07:00
Xavier Ducrohet
29c732154d resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp
Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602
2011-07-20 17:45:11 -07:00
Jeff Brown
131851ee6c Merge "Remove unimplemented memory pool." 2011-07-20 17:42:36 -07:00
Dirk Dougherty
5d49f6dc39 Merge "Cherrypick from honeycomb-mr2: Doc change: diff report for API level 13." 2011-07-20 17:35:28 -07:00
Xavier Ducrohet
e5e476f18b am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
* commit 'a125c937de06b1cc43368743592f47513eb88b76':
  Add generation of dependency file for .ap_ package
2011-07-20 17:18:04 -07:00
Xavier Ducrohet
7ffa22b984 resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
2011-07-20 16:31:25 -07:00
James Dong
41ce328f7e Merge "Let the media recording framework release the Camera object when it is the owner" 2011-07-20 16:08:32 -07:00
Xavier Ducrohet
2cb8dfb33d am b582af31: am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs"
* commit 'b582af31c74a58922120fdb747c1a3b867d95e90':
  Added Caching for PreProcessed PNGs
2011-07-20 16:02:33 -07:00
Xavier Ducrohet
97aaf7cbb9 am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs"
* commit '0bc12a0b13719976aff95a801d88e48c64510d11':
  Added Caching for PreProcessed PNGs
2011-07-20 16:00:44 -07:00
Xavier Ducrohet
0d4b0738b5 Merge "Added Caching for PreProcessed PNGs" 2011-07-20 15:55:33 -07:00
Xavier Ducrohet
5c0019bdac am 30824495: am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package"
* commit '3082449508a8c574d0476fdb988f98d9554637ae':
  Add generation of dependency file for .ap_ package
2011-07-20 15:27:39 -07:00
Xavier Ducrohet
99f603397f am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package"
* commit '1e24ccbdd56a45c8bb5f2eba94af5aecd2d02554':
  Add generation of dependency file for .ap_ package
2011-07-20 15:23:55 -07:00
Jeff Brown
585ef1e14a Remove unimplemented memory pool.
dlmalloc does such a great job that we don't need a pool anyways.

Change-Id: I105b28c4a5c491543959190c7c0a9de75a5b8052
2011-07-20 15:19:50 -07:00
Jim Miller
0a294f87c8 Merge "Fix 5056699: GridLayout should maintain static indices for "gone" views." 2011-07-20 15:19:19 -07:00
Jesse Wilson
5f2388278d Merge "Appease Doclava for ReferenceQueue.remove()" 2011-07-20 15:11:45 -07:00
Xavier Ducrohet
6e068693b3 Merge "Add generation of dependency file for .ap_ package" 2011-07-20 15:08:23 -07:00
Adam Powell
c7d82227b7 Merge "Fix bug 5038368 - Rules for collapsing action views." 2011-07-20 14:30:48 -07:00
Jesse Wilson
92c165c45f Merge "Acknowledge that the platform guarantees UTF-8 and UTF-16." 2011-07-20 13:41:57 -07:00
Jesse Wilson
4f973b91c4 Merge "Skip byte order mark (BOM) in JsonReader" 2011-07-20 13:38:24 -07:00
Daniel Sandler
fa877568c2 Merge "Fix dancing download notifications on phones." 2011-07-20 12:44:20 -07:00
Dave Santoro
8bedd5b4d6 Merge "Updates and fixes for the social stream API." 2011-07-20 12:43:26 -07:00
Costin Manolache
747dea0a42 Merge "waitWithTimeout() needs to check if the result is already available, like waitForActivity() does." 2011-07-20 12:33:42 -07:00
Chia-chi Yeh
4e1416de92 Merge "ConnectivityService: Implement VPN callbacks to update DNS servers." 2011-07-20 12:28:04 -07:00
Mike Lockwood
28737cd317 Merge "MediaScanner: Do separate bulk inserts for different media types" 2011-07-20 12:15:48 -07:00
Debashish Chatterjee
d073890bec Merge "Removed READ_WRITE_ALL_VOICEMAILS permission from framework." 2011-07-20 11:54:56 -07:00
Eric Laurent
dc1a132efe Merge "Fix issue 5012047: silent mode mutes music" 2011-07-20 11:04:18 -07:00
Jamie Gennis
769212eccb Merge "MediaPlayer: add a disconnect from ANativeWindow" 2011-07-20 10:47:04 -07:00
Robert Greenwalt
785711d243 Merge "Start default connections on startup." 2011-07-20 10:10:24 -07:00
Alex Sakhartchouk
93cd5e06bf Merge "Correctly call glviewport when surface changes." 2011-07-20 09:41:50 -07:00
Gilles Debunne
5d0494ab0a Merge "Insertion handles fades out after being positionned" 2011-07-20 09:12:41 -07:00
Russell Brenner
2d26db32a4 Merge "Replace DroidKufi-Regular with DroidNaskh-Regular" 2011-07-20 08:39:28 -07:00
Russell Brenner
004c4dd3ba Merge "Replace DroidSansArabic with DroidKufi-Regular" 2011-07-20 08:39:13 -07:00
Andreas Huber
597014b411 Merge "Content found in the wild violated the MPEG4 systems specs" 2011-07-20 08:05:06 -07:00
Debashish Chatterjee
ea3b527f0b Merge "Voicemail content provider API for api council review." 2011-07-20 05:34:01 -07:00
Alon Albert
4501d805ab Merge "Add a getter for the active tag" 2011-07-19 22:06:34 -07:00
Irfan Sheriff
1597446bc8 Merge "Adding WifiInfo object in CONNECTED broadcast" 2011-07-19 19:42:35 -07:00
Adam Cohen
4fd15f5434 Merge "Adding resizeMinWidth/Height to AppWidgetProviderInfo" 2011-07-19 18:43:57 -07:00
Dianne Hackborn
9e4b9fe5f7 Merge "Fix issue #4999574: Disabled system app not listed in Settings after reboot" 2011-07-19 18:07:00 -07:00
Dianne Hackborn
1a8abcac47 Merge "Fix issue #4976176: Font size setting does not persist" 2011-07-19 18:06:25 -07:00
Stephen Hines
2074edb67f Merge "Extract BC metadata using a single call." 2011-07-19 17:45:49 -07:00
Eric Laurent
4e82020f69 Merge "Fix issue 4499450: Unknown Ringer Mode" 2011-07-19 17:27:24 -07:00
Xavier Ducrohet
9f9978b7cd Merge "Layoutlib: misc fix + start of AndroidBidi support." 2011-07-19 17:23:00 -07:00
Romain Guy
c40bafd21e Merge "Add new OpenGL test" 2011-07-19 17:21:46 -07:00
Romain Guy
868a0aff31 Add new OpenGL test
Change-Id: Icab48d71945bf94dd53f58b728a951d46380d945
2011-07-19 17:20:35 -07:00
Daniel Sandler
c021e05bc4 Merge "Fix stacked notifications." 2011-07-19 17:14:51 -07:00