24486 Commits

Author SHA1 Message Date
Nick Pelly
cb2555ebb6 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
d19c397b04 Merge "Do not log AT command traffic by default." into froyo 2010-06-24 11:52:39 -07:00
Nick Pelly
801dbe26ee Do not log AT command traffic by default.
Bug: 2792732
Change-Id: I0ef25f38f38685291af6680cf653046eb391da5a
2010-06-24 11:48:54 -07:00
Dianne Hackborn
baf42c625c Add APIs for finding heavy-weight apps.
Change-Id: I6c865cce404cac1a08eee056f963de5d276d5898
2010-06-24 11:38:47 -07:00
James Dong
40d9f0105f 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
7fd22aab45 Merge "Fixed the software AAC encoder" into gingerbread 2010-06-24 09:46:48 -07:00
Mike Lockwood
5da347dd2d 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
477def1d42 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
0d964c9445 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
a2549bb644 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
Mike Lockwood
2423607a32 Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
We now broadcast Usb.ACTION_USB_CONNECTED and Usb.ACTION_USB_DISCONNECTED
when USB is connected or disconnected.
The ACTION_USB_CONNECTED extras indicate the enabled/disabled state of
all USB functions.

Change-Id: I11495d039429dbe22bd738067296e39ae415befa
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-24 09:36:50 -04:00
Mike Lockwood
9163d42a50 DO NOT MERGE Add new permission to allow access to USB devices
Adds permission android.permission.ACCESS_USB.
This is a partial cherry pick of a change from master.
It adds the permission, but not the support for associating it
the AID_USB group.

Change-Id: If5816721a4fc88bf444141a7b717da65ea37d5f4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-24 09:36:35 -04:00
Joe Onorato
801b63d3b8 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
51e895f055 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
Joe Onorato
c27bb55980 Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
changed.

Bug: 2772728
Change-Id: I9e230fbe42d01cfc953cdafb86dd0d616d96a3ea
2010-06-23 17:44:30 -07:00
James Dong
438e4f62ad Fixed the software AAC encoder
Make sure that each input frame contains at least 1024 samples, as
required by the AAC encoder, and fix the incorrect timestamp.

Change-Id: I344cafe8c89be51d6e64552fab70539990ff6049
2010-06-23 17:12:11 -07:00
Christopher Tate
bc0793e4b7 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
0379118827 Merge "Remember to initialize timestamps in the dispatch allocator" into gingerbread 2010-06-23 16:52:37 -07:00
Christopher Tate
e91a5db35b Remember to initialize timestamps in the dispatch allocator
Change-Id: I83a2d353c34ff84a7d130e602c6dedc6a5541944
2010-06-23 16:51:07 -07:00
Andreas Huber
8d65dd2653 Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce
related-to-bug: 2370115
2010-06-23 16:40:57 -07:00
Joe Onorato
2d8e249854 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
4ca092c7f1 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
90ade3f25d 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
9afc1b3ed3 Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbread 2010-06-23 15:13:55 -07:00
Dianne Hackborn
98f7aed66b 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
Dianne Hackborn
1e4b9f3936 Remove InputConsumer, replacing with InputQueue.
Change-Id: Ib06907278457aaee842b123adc072840ca3602d8
2010-06-23 14:37:30 -07:00
James Dong
39a0b21c65 Fixed some meta data issues in the recorded mp4 file
- Mainly correcting the location of stbl box which should be a child of minf box.
  This resolved the issue where the mis-muxed encoded file could not be played by QT/VLC.

- Enabled the the recorded tracks by setting the flags to 0x07 by default

- Allows for encoding either 32-bit or 64-bit offsets. By default encoding
  32-bit offsets to reduce the metadata overhead

- Fixed a edts box issue where an empty elst box was used at the end

Change-Id: I570621a26714a81dc9400271aa5d3a07b483172f
2010-06-23 14:09:18 -07:00
Daniel Sandler
c82b4e80b8 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
Daniel Sandler
69a4817e3e Immersive activity API.
An Activity can declare itself to be "immersive" either by
setting android:immersive="true" in AndroidManifest or by
calling setImmersive(true).

Immersive activities "should" not be interrupted, for
example by Notifications with an associated
fullScreenIntent. (In the future we may even prevent any
non-system application from successfully calling
startActivity() if the foreground activity is immersive.)
Notifications with FLAG_HIGH_PRIORITY set will be shown to
the user in some less-obtrusive way if the frontmost
activity is immersive.

Change-Id: I8d0c25cc4e22371c27cbf2bb6372d2c95d57b2d7
2010-06-23 16:29:36 -04:00
Mike Lockwood
e496326083 am efbe2d78: Merge "andriod.location.Criteria: Simplify new location criteria APIs a bit." into gingerbread
Merge commit 'efbe2d78ee5e26b6606c8552a5c1ac70749a5013' into gingerbread-plus-aosp

* commit 'efbe2d78ee5e26b6606c8552a5c1ac70749a5013':
  andriod.location.Criteria: Simplify new location criteria APIs a bit.
2010-06-23 13:20:20 -07:00
Andreas Huber
03e90f7eeb am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread
Merge commit '58e9402b12218ca498ea3b932e16819612b1ea87' into gingerbread-plus-aosp

* commit '58e9402b12218ca498ea3b932e16819612b1ea87':
  Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
2010-06-23 13:20:15 -07:00
Mike Lockwood
efbe2d78ee Merge "andriod.location.Criteria: Simplify new location criteria APIs a bit." into gingerbread 2010-06-23 13:14:47 -07:00
Andreas Huber
58e9402b12 Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread 2010-06-23 13:14:16 -07:00
Andreas Huber
800af39038 am b64af9a2: Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
Merge commit 'b64af9a221c1df4853ab7c7766d5f956c61b8765' into gingerbread-plus-aosp

* commit 'b64af9a221c1df4853ab7c7766d5f956c61b8765':
  Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
2010-06-23 13:00:47 -07:00
Mike Lockwood
8900c32986 andriod.location.Criteria: Simplify new location criteria APIs a bit.
Remove ACCURACY_BEST and only use ACCURACY_MEDIUM for horizontal accuracy.
Remove accuracy priority support, since it be difficult to implement in some cases.

Change-Id: I785a781f8d8f3bf3be6693ad71d077b6eb280c31
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-23 14:34:03 -04:00
Andreas Huber
fb41d59595 Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
Change-Id: I863651619f84b2b66e9a926ce1fef8ce6a53a42d
related-to-bug: 2639116
2010-06-23 11:33:43 -07:00
Andreas Huber
b64af9a221 Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
Change-Id: I11abc05b62a958ffbc99ca997cd184a2f2199352
related-to-bug: 2667479
2010-06-23 11:11:58 -07:00
Adam Powell
bc337d2f67 am 73ccafb5: Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread
Merge commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf' into gingerbread-plus-aosp

* commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf':
  Fix a bug where requestDisallowInterceptTouchEvent does not get called
2010-06-23 10:28:00 -07:00
Adam Powell
73ccafb5b8 Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread 2010-06-23 10:26:44 -07:00
Scott Main
0c837a2e35 am 9fe2c4e2: am 753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
Merge commit '9fe2c4e2b89cbe4e22fdbcb3d5ecae1a853b133e' into gingerbread-plus-aosp

* commit '9fe2c4e2b89cbe4e22fdbcb3d5ecae1a853b133e':
  docs: update backup dev guide with Android Backup Service registration info
2010-06-23 10:13:43 -07:00
Scott Main
a5bd886af3 am 753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
Merge commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b' into froyo-plus-aosp

* commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b':
  docs: update backup dev guide with Android Backup Service registration info
2010-06-23 10:08:45 -07:00
Scott Main
9fe2c4e2b8 am 753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
Merge commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b' into gingerbread

* commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b':
  docs: update backup dev guide with Android Backup Service registration info
2010-06-23 10:07:37 -07:00
Scott Main
753e56090e Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo 2010-06-23 09:57:46 -07:00
Scott Main
964384962d docs: update backup dev guide with Android Backup Service registration info
Change-Id: I16696abbd517a5a740ff641ca0b17ffafbcf4993
2010-06-22 19:26:16 -07:00
Eric Laurent
845f541454 am 2c2ce8e5: Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread
Merge commit '2c2ce8e53f5eb94916a5d0f40b2877cc7551870d' into gingerbread-plus-aosp

* commit '2c2ce8e53f5eb94916a5d0f40b2877cc7551870d':
  Added support for audio sessions in MediaPlayer and AudioTrack.
2010-06-22 18:32:17 -07:00
Eric Laurent
2c2ce8e53f Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread 2010-06-22 18:29:57 -07:00
Chia-chi Yeh
da9269af5e am 3238302b: Merge "media: add AudioRecord::getMinFrameCount()." into gingerbread
Merge commit '3238302b1819bb384b79402c0106a2bdfc3f35d0' into gingerbread-plus-aosp

* commit '3238302b1819bb384b79402c0106a2bdfc3f35d0':
  media: add AudioRecord::getMinFrameCount().
2010-06-22 17:22:10 -07:00
Chia-chi Yeh
3238302b18 Merge "media: add AudioRecord::getMinFrameCount()." into gingerbread 2010-06-22 17:20:44 -07:00
Adam Powell
110486f932 Fix a bug where requestDisallowInterceptTouchEvent does not get called
when scrolling is resumed after stopping a fling.

Change-Id: I6796c5082cb81b3116de5baf1f27fe3addb40d00
2010-06-22 17:14:44 -07:00
Eric Laurent
619346f902 Added support for audio sessions in MediaPlayer and AudioTrack.
Audio sessions are used to associate audio effects to particular instances (or groups) of MediaPlayers or AudioTracks.

Change-Id: Ib94eec43241cfcb416590f435ddce7ab39a07640
2010-06-22 17:14:04 -07:00