Commit Graph

16634 Commits

Author SHA1 Message Date
Andreas Huber
deaaf5029a Merge "Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers" into gingerbread 2010-06-25 11:03:42 -07:00
James Dong
2972e7a8ac am 6feaa464: Enable passing parameters to the MediaWriter at runtime (at start() call).
Merge commit '6feaa46496bae85adbe10e84611592612f898081' into gingerbread-plus-aosp

* commit '6feaa46496bae85adbe10e84611592612f898081':
  Enable passing parameters to the MediaWriter at runtime (at start() call).
2010-06-25 10:57:12 -07:00
The Android Open Source Project
aa25569069 ignore from froyo-plus-aosp
Change-Id: I8144bf5c270b95c06252e7195b7cc2bc91452849
2010-06-25 10:51:16 -07:00
James Dong
f750cd89de am 5a905ceb: Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread
Merge commit '5a905ceb063bd31170d3d869efcd051cbd8e4e13' into gingerbread-plus-aosp

* commit '5a905ceb063bd31170d3d869efcd051cbd8e4e13':
  Track maximum amplitude and fix getMaxAmplitude()
2010-06-25 09:47:51 -07:00
James Dong
0284cd2386 Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread 2010-06-25 09:43:14 -07:00
Bruce Beare
a1a79197c0 Fix missing NL
Change-Id: I323f0c01d2e9ad4c9f07cad24bf6b63edc28ad62
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-06-25 09:08:12 -07:00
Mathias Agopian
8c3c51bb33 Fix a bug in sp<> and wp<> which could cause memory corruptions
when assigning a smart pointer to another one, we need to make
sure to read all the data we need from the right-hand-side
reference (the assignee) before we decRef the assigned.

This bug would cause linked-list of smart-pointers to fail
miserably.

Change-Id: Ibb554c15fddf909f7737c632b7c80322e80ea93f
2010-06-24 21:49:02 -07:00
Mathias Agopian
01420d4d47 am 081bc5c4: fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Merge commit '081bc5c47d8a980e6eafa70ddafcd89981586391' into gingerbread-plus-aosp

* commit '081bc5c47d8a980e6eafa70ddafcd89981586391':
  fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
2010-06-24 21:36:37 -07:00
Mathias Agopian
01e4483b29 fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Make sure to not use GL_TEXTURE_EXTERNAL when it's not supported
by the GL. The error was harmless, but annoying.

Change-Id: I571a9a9b05d35da51420950a6a6e95629067efd0
2010-06-24 21:28:59 -07:00
Daniel Sandler
ddcc9cdce8 am 8896783d: Updated StatusBar test app for new notifications API.
Merge commit '8896783dc1d31c5274b277c364da0ffe7cc27cca' into gingerbread-plus-aosp

* commit '8896783dc1d31c5274b277c364da0ffe7cc27cca':
  Updated StatusBar test app for new notifications API.
2010-06-24 19:13:25 -07:00
Daniel Sandler
86514f07ca am 87160757: Basic handling of Notifications with fullScreenIntent.
Merge commit '87160757e827e8e158d233de09d70e7128184729' into gingerbread-plus-aosp

* commit '87160757e827e8e158d233de09d70e7128184729':
  Basic handling of Notifications with fullScreenIntent.
2010-06-24 19:13:22 -07:00
Scott Main
82267d33d4 am 7dacda11: am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '7dacda1142379df1f1f9854c24e452acdea98436' into gingerbread-plus-aosp

* commit '7dacda1142379df1f1f9854c24e452acdea98436':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:16:31 -07:00
Scott Main
68a41d7f56 am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into froyo-plus-aosp

* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:14:06 -07:00
Scott Main
9a4a1d7104 am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into gingerbread

* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:12:49 -07:00
Scott Main
29d8e66ce0 Merge "docs: Remove the TOS from download flow and remove TOS entirely because it's no longer relevant to the SDK download package" into froyo 2010-06-24 18:10:41 -07:00
Joe Onorato
824a9be4e9 am 0a0edcca: Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread
Merge commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9' into gingerbread-plus-aosp

* commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9':
  Fix the notification vibration setting and add a test app that lets you recover from the busted
2010-06-24 17:53:28 -07:00
Joe Onorato
b293194aaf Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread 2010-06-24 17:51:22 -07:00
Dianne Hackborn
3ac5c060c0 am 2529a453: Merge "Make bad notifications crash their application." into gingerbread
Merge commit '2529a45339b7e02d9d2b813358bcecd144a971ea' into gingerbread-plus-aosp

* commit '2529a45339b7e02d9d2b813358bcecd144a971ea':
  Make bad notifications crash their application.
2010-06-24 17:30:42 -07:00
Dianne Hackborn
d5715e00b0 Merge "Make bad notifications crash their application." into gingerbread 2010-06-24 17:28:13 -07:00
Dianne Hackborn
d4002eef0f am 5340bffd: am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
Merge commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961' into gingerbread-plus-aosp

* commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961':
  Properly note the current active restore set's token
2010-06-24 16:04:07 -07:00
Dianne Hackborn
ab32c11fd2 am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into froyo-plus-aosp

* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
  Properly note the current active restore set's token
2010-06-24 16:02:03 -07:00
Dianne Hackborn
d965b79268 am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into gingerbread

* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
  Properly note the current active restore set's token
2010-06-24 16:01:39 -07:00
Dianne Hackborn
2f90b21533 Merge "Properly note the current active restore set's token" into froyo 2010-06-24 16:00:06 -07:00
Dianne Hackborn
f5f049c70d am 01e4cfc4: Some ActivityThread/ActivityManager cleanup.
Merge commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301' into gingerbread-plus-aosp

* commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301':
  Some ActivityThread/ActivityManager cleanup.
2010-06-24 15:23:59 -07:00
Andreas Huber
0c7fb72274 am 7b5b27ad: Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread
Merge commit '7b5b27ada12d3680dec20274fa655fd7f73f839e' into gingerbread-plus-aosp

* commit '7b5b27ada12d3680dec20274fa655fd7f73f839e':
  Properly identify malformed (too short) chunks in mpeg4 files.
2010-06-24 13:16:47 -07:00
Andreas Huber
e0bdac3197 Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread 2010-06-24 13:14:38 -07:00
Dianne Hackborn
0cb77eb8ab am e57c3a88: Merge "Add APIs for finding heavy-weight apps." into gingerbread
Merge commit 'e57c3a88b99856d1e69fdf115e7c7954594b7385' into gingerbread-plus-aosp

* commit 'e57c3a88b99856d1e69fdf115e7c7954594b7385':
  Add APIs for finding heavy-weight apps.
2010-06-24 12:42:55 -07:00
Dianne Hackborn
68b8f3aeae Merge "Add APIs for finding heavy-weight apps." into gingerbread 2010-06-24 12:41:01 -07:00
Nick Pelly
0915d189fb am 9bf39efb: Do not log AT command traffic by default.
Merge commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44' into gingerbread-plus-aosp

* commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44':
  Do not log AT command traffic by default.
2010-06-24 12:27:46 -07:00
Nick Pelly
fe7952dd3b am ab04f978: am d19c397b: (-s ours) Merge "Do not log AT command traffic by default." into froyo
Merge commit 'ab04f97855a5097815e8e7b99beb42e9b3bac388' into gingerbread-plus-aosp

* commit 'ab04f97855a5097815e8e7b99beb42e9b3bac388':
  Do not log AT command traffic by default.
2010-06-24 12:17:25 -07:00
Nick Pelly
76d0df9956 am d19c397b: (-s ours) Merge "Do not log AT command traffic by default." into froyo
Merge commit 'd19c397b04f485e0af5990f3541e703934869290' into gingerbread

* commit 'd19c397b04f485e0af5990f3541e703934869290':
  Do not log AT command traffic by default.
2010-06-24 12:15:29 -07:00
Nick Pelly
b7687fd9a6 am d19c397b: Merge "Do not log AT command traffic by default." into froyo
Merge commit 'd19c397b04f485e0af5990f3541e703934869290' into froyo-plus-aosp

* commit 'd19c397b04f485e0af5990f3541e703934869290':
  Do not log AT command traffic by default.
2010-06-24 11:55:56 -07:00
Nick Pelly
7ed4deb035 Merge "Do not log AT command traffic by default." into froyo 2010-06-24 11:52:39 -07:00
James Dong
468b7016a3 am 7fd22aab: Merge "Fixed the software AAC encoder" into gingerbread
Merge commit '7fd22aab4506f65b7929ed1030bdd71c56f7db77' into gingerbread-plus-aosp

* commit '7fd22aab4506f65b7929ed1030bdd71c56f7db77':
  Fixed the software AAC encoder
2010-06-24 09:48:33 -07:00
James Dong
82ee5fd209 Merge "Fixed the software AAC encoder" into gingerbread 2010-06-24 09:46:48 -07:00
Mike Lockwood
9801aa1aa5 am 477def1d: Merge changes I11495d03,If5816721 into gingerbread
Merge commit '477def1d4216f82bdfe58525131db88b384fc5a5' into gingerbread-plus-aosp

* commit '477def1d4216f82bdfe58525131db88b384fc5a5':
  Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
  DO NOT MERGE Add new permission to allow access to USB devices
2010-06-24 09:28:59 -07:00
Mike Lockwood
169e475b38 Merge changes I11495d03,If5816721 into gingerbread
* changes:
  Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
  DO NOT MERGE Add new permission to allow access to USB devices
2010-06-24 09:26:55 -07:00
Andreas Huber
834e9f62d8 am a2549bb6: Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread
Merge commit 'a2549bb644d8ca4b0209d6d2f0c4160521789aa9' into gingerbread-plus-aosp

* commit 'a2549bb644d8ca4b0209d6d2f0c4160521789aa9':
  Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
2010-06-24 09:06:49 -07:00
Andreas Huber
efc4b45cb7 Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread 2010-06-24 09:05:08 -07:00
Joe Onorato
c6f99ba809 am 51e895f0: Merge "Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout changed." into gingerbread
Merge commit '51e895f055f76ad0114a18e1b754a1475a62c524' into gingerbread-plus-aosp

* commit '51e895f055f76ad0114a18e1b754a1475a62c524':
  Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
2010-06-23 17:48:18 -07:00
Joe Onorato
23bb7aae2e Merge "Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout changed." into gingerbread 2010-06-23 17:46:46 -07:00
Christopher Tate
fa870516cf am 03791188: Merge "Remember to initialize timestamps in the dispatch allocator" into gingerbread
Merge commit '0379118827ef7e81a70e88e5910f5c7536d8b945' into gingerbread-plus-aosp

* commit '0379118827ef7e81a70e88e5910f5c7536d8b945':
  Remember to initialize timestamps in the dispatch allocator
2010-06-23 16:55:07 -07:00
Christopher Tate
cc61ac50a8 Merge "Remember to initialize timestamps in the dispatch allocator" into gingerbread 2010-06-23 16:52:37 -07:00
Christopher Tate
d974e00697 Remember to initialize timestamps in the dispatch allocator
Change-Id: I83a2d353c34ff84a7d130e602c6dedc6a5541944
2010-06-23 16:51:07 -07:00
Joe Onorato
0e65285535 am 4ca092c7: Merge "Fix bug 2772728 with the suggested fix. I wasn\'t able to reproduce it though." into gingerbread
Merge commit '4ca092c7f101cbd95833a9ed8936e9e0485585ad' into gingerbread-plus-aosp

* commit '4ca092c7f101cbd95833a9ed8936e9e0485585ad':
  Fix bug 2772728 with the suggested fix.  I wasn't able to reproduce it though.
2010-06-23 16:10:01 -07:00
Joe Onorato
9ff7d34ad3 Merge "Fix bug 2772728 with the suggested fix. I wasn't able to reproduce it though." into gingerbread 2010-06-23 16:08:06 -07:00
James Dong
d7d37effd6 am 9afc1b3e: Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbread
Merge commit '9afc1b3ed3eb8dbfb440600495d92def88934f54' into gingerbread-plus-aosp

* commit '9afc1b3ed3eb8dbfb440600495d92def88934f54':
  Fixed some meta data issues in the recorded mp4 file
2010-06-23 15:16:25 -07:00
James Dong
53e314a214 Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbread 2010-06-23 15:13:55 -07:00
Dianne Hackborn
dee2ba4efc am 1e4b9f39: Remove InputConsumer, replacing with InputQueue.
Merge commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440' into gingerbread-plus-aosp

* commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440':
  Remove InputConsumer, replacing with InputQueue.
2010-06-23 14:40:36 -07:00
Daniel Sandler
ea8faffe04 am 69a4817e: Immersive activity API.
Merge commit '69a4817e3e1e368e758ff8c238deb5ee26963c04' into gingerbread-plus-aosp

* commit '69a4817e3e1e368e758ff8c238deb5ee26963c04':
  Immersive activity API.
2010-06-23 13:36:25 -07:00