drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,630 Commits 1 Branch 0 Tags
Commit Graph

69630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Insun Kang
41f3f716b0 Defines MediaPlayer APIs to support multiple audio/video/timedtext 
tracks.

o Newly introduced APIs are (MediaPlayer):
  getTrackInfo() / addExternalSource() / enableTrack() / disableTrack().

o Timed text tracks are supported only, for now.

o TODOs:
 - Define the audio/video behavior for enableTrack and disableTrack.
 - Refactoring AwesomePlayer / TimedTextDriver so that all types of
   track index can be managed in the correct order and be ready for
   supporting audio/video tracks.
   (MediaExtractor and MediaSource for text file might be necessary.)

Change-Id: Idb85e1b3f2ed49a64f377d05472dd6663ce94e07
 2012-03-15 08:36:52 +09:00
Glenn Kasten
81fe4fbd6b Merge "AudioFlinger playback thread CPU measurement in Hz" 2012-03-14 16:28:38 -07:00
Selim Gurun
658dcd87db Fix file path calculation for asset files. 
Bug: 6019611
filter out query params and URI fragments from file path.

Change-Id: Ia5892490a5ffa89d82b52c2a5e6956a244566a4a
 2012-03-14 16:24:31 -07:00
Robert Ly
957f716cf1 docs: fix toc in search au class 
Change-Id: I7c678a9091a5d2c7bdfcf5e104597d9c1986d5f0
 2012-03-14 16:24:25 -07:00
Scott Main
1657080a0c docs: update various SDK and AVD Manager screenshots 
and remove one from the licensing doc that's not necessary

Change-Id: I4b07446a8fd57449dfd9b605019143f543be5e14
 2012-03-14 16:16:18 -07:00
Russell Brenner
1f1bc8b12a Merge "Add notes about switching languages" 2012-03-14 16:15:42 -07:00
Craig Mautner
e32c307841 Separate out animations from layout. 
(Dianne) pulled the animation steps out of the layout. Changes to
exposed layers cause repeated calls to layout code.

Combined animation steps into start and finish animation code.

Change-Id: I3602d1d6249d20987d102a54e3a67a7a39361b55
 2012-03-14 16:09:28 -07:00
Glenn Kasten
f57e2bceb9 AudioFlinger playback thread CPU measurement in Hz 
Log statistics on CPU usage in Hz in addition to wall clock time

Use CPU statistics for all playback threads, not just MIXER
(but they are disabled by default by a compile-time debug macro).

ThreadCpuUsage library:
 - Move statistics out of the library and leave that up to the caller
 - Add API to determine a CPU's frequency

Change-Id: Ia1011123146e641fcf210ef26e78ae2b4d3b64ad
 2012-03-14 16:03:01 -07:00
Marco Nelissen
2af9dc5ecc Merge "Unhide MediaPlayer.setNextMediaPlayer" 2012-03-14 16:00:19 -07:00
Robert Ly
9c0ce08e6e am 363d178f: am b285125d: Merge "docs: android u search class" into ics-mr1 
* commit '363d178fac6392edfe9981b6b80a8e1ba724f0ac':
 2012-03-14 15:52:15 -07:00
Robert Ly
d01ec4c9af am c3b24faa: am b285125d: Merge "docs: android u search class" into ics-mr1 
* commit 'c3b24faa078a8f0fc4817dc06b3ababa7503afda':
  docs: android u search class
 2012-03-14 15:50:08 -07:00
Glenn Kasten
00b0a85e90 Remove false dependencies 
Change-Id: I2a2976eb27b262bcba0c76ab37d822407d2337a7
 2012-03-14 15:48:22 -07:00
Robert Ly
363d178fac am b285125d: Merge "docs: android u search class" into ics-mr1 
* commit 'b285125d4bad1c76e95cd24956711deb9908c4a8':
  docs: android u search class
 2012-03-14 15:46:17 -07:00
Robert Ly
c3b24faa07 am b285125d: Merge "docs: android u search class" into ics-mr1 
* commit 'b285125d4bad1c76e95cd24956711deb9908c4a8':
  docs: android u search class
 2012-03-14 15:46:10 -07:00
Jason Sams
47324e940a Merge "Fix minor C++ api issues." 2012-03-14 15:43:27 -07:00
Eric Fischer
f97b46b272 Merge "Import translations. DO NOT MERGE" 2012-03-14 15:42:44 -07:00
Robert Ly
b285125d4b Merge "docs: android u search class" into ics-mr1 2012-03-14 15:41:02 -07:00
Jason Sams
d1c8c1292c Fix minor C++ api issues. 
Change-Id: I30e12938be5da52b2d952db57a51b4deb5e27239
 2012-03-14 15:36:02 -07:00
Eric Laurent
5b9e0684fe Merge "audioflinger: more info in dumpsys" 2012-03-14 15:30:05 -07:00
Eric Laurent
0194a0d0dd audioflinger: more info in dumpsys 
Added TID and io handle to AudioFlinger threads dump.

Change-Id: Ib1a856f3bad55c73e4c395b5e59d57435f4b9a4c
 2012-03-14 15:04:54 -07:00
Omari Stephens
0c15f85824 Merge "Try to make error messages more useful and improve ANR handling" 2012-03-14 14:54:29 -07:00
Amith Yamasani
1b6ae002a5 Fix sync tests failure. 
Bug: 6156819 Contacts initial sync test fails

Earlier commit was incorrectly cloning the currentSyncs list, so it
wasn't being updated.

Change-Id: I23cea8a190127746e9a1218e7bfda630599cef17
 2012-03-14 14:53:36 -07:00
Omari Stephens
8ac5959729 Merge "Avoid crashes in a single app from causing cascading test failures" 2012-03-14 14:53:21 -07:00
Marco Nelissen
467ec7eda8 Unhide MediaPlayer.setNextMediaPlayer 
The Music apps are unbundled, so this needs to be unhidden for them to use it.

Change-Id: I24330a2d6cfa2f5fb5f9c282d28f5431b6165095
 2012-03-14 14:49:02 -07:00
Teng-Hui Zhu
72b91b5e0c Merge "Live streaming video may not have the right size at prepared" 2012-03-14 14:47:23 -07:00
Glenn Kasten
58984b0738 Merge "Break circular dependency on media player service" 2012-03-14 13:57:03 -07:00
Glenn Kasten
9d41361634 Merge "Prepare frameworks/native/services/audioflinger" 2012-03-14 13:56:25 -07:00
Teng-Hui Zhu
5a080e2207 Live streaming video may not have the right size at prepared 
The fix is add the OnVideoSizeChangedListener.
bug:5420327

Change-Id: I1e0b371b8b95b86a1c0903f4bdb1d8f38de793b7
 2012-03-14 13:54:59 -07:00
Glenn Kasten
6940484150 Merge "Use correct syntax for #include <> """ 2012-03-14 13:54:21 -07:00
Dianne Hackborn
5108b1b3cf Merge "Add new "options" argument to all startActivity APIs." 2012-03-14 13:48:51 -07:00
Jake Hamby
f98f68d5ad Merge "Add support for CMAS warning notifications over CDMA." 2012-03-14 13:25:18 -07:00
Eric Fischer
e0b0a2c11d Import translations. DO NOT MERGE 
Change-Id: I31003b11213e50fff8e42da9aaef3c60804d1301
 2012-03-14 13:16:04 -07:00
Dianne Hackborn
a4972e951b Add new "options" argument to all startActivity APIs. 
This will be used to allow new features to be requested...  such as,
say, a special kind of animation.  Right now there are no options
defined.

Change-Id: I4eb6f27275cdd4bf186f6da316ab93a2372ad4b7
 2012-03-14 12:57:14 -07:00
James Dong
89ea4ca9c2 Merge "make sure that lower-case mime and file suffix is used to check against the supported ones" 2012-03-14 10:43:22 -07:00
James Dong
8e3fac28a0 Merge "Fixed a buffer overflow bug in DrmPassthruPlugin" 2012-03-14 10:43:18 -07:00
James Dong
2bab6b63c7 Merge "Turned off log spamming from DrmPassthruPlugin" 2012-03-14 10:43:12 -07:00
Gilles Debunne
48b050a213 Merge "Use SpanSet to accelerate Layout.drawBackground" 2012-03-14 10:40:02 -07:00
Eino-Ville Talvala
0016813784 Merge "Add references to MediaActionSound in Camera documentation." 2012-03-14 10:34:05 -07:00
Omari Stephens
bf29121c21 Try to make error messages more useful and improve ANR handling 
Bug: 6128185
Change-Id: I6032a199c26577fb3058ff4038085de257781d81
 2012-03-13 23:17:45 -07:00
Scott Main
0b4ec63cd1 am 6513bceb: am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1 
* commit '6513bceb8e647efd9039e2dd23eaa5c302b11d93':
 2012-03-13 23:17:08 -07:00
Scott Main
fb058ddb8b am 82916294: am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1 
* commit '82916294a326e829cd1487ccb56a3ee5346ea8ac':
  docs: remove link from GP logo
 2012-03-13 23:15:52 -07:00
Scott Main
82916294a3 am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1 
* commit '7f94977867ae67aa4f75d9db5de94e1233a2d7fe':
  docs: remove link from GP logo
 2012-03-13 23:12:18 -07:00
Scott Main
6513bceb8e am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1 
* commit '7f94977867ae67aa4f75d9db5de94e1233a2d7fe':
  docs: remove link from GP logo
 2012-03-13 23:12:09 -07:00
Scott Main
7f94977867 Merge "docs: remove link from GP logo" into ics-mr1 2012-03-13 23:09:09 -07:00
Junichi Monma
896a638b34 am 41d72c86: Merge "DO NOT MERGE : New version of DroidSansFallback font" into ics-scoop 
* commit '41d72c86032d2b1d1744049caa3746947ac58b3f':
  DO NOT MERGE : New version of DroidSansFallback font
 2012-03-13 22:52:57 -07:00
Junichi Monma
41d72c8603 Merge "DO NOT MERGE : New version of DroidSansFallback font" into ics-scoop 2012-03-13 22:48:38 -07:00
Omari Stephens
ad8037e3a9 Avoid crashes in a single app from causing cascading test failures 
This should work properly for crashes.  It currently doesn't do the right
thing for ANRs since, in a lot of cases, they seem to happen asynchronously
_after_ the testcase has ended.  Will try to improve that behavior with a
subsequent change.

Bug: 6128185
Change-Id: Ie535141e879062c11ee7108b37d282a33a5b5eef
 2012-03-13 21:57:54 -07:00
Michael Jurka
605eabf6a2 Merge "Fix hardware layer redraw bug" 2012-03-13 19:56:33 -07:00
James Dong
32d8fc8d6d Fixed a buffer overflow bug in DrmPassthruPlugin 
Change-Id: I8df2a90409c9266a094a1a0904a5ff76ec483d16
 2012-03-13 19:23:23 -07:00
James Dong
c3259471c6 Turned off log spamming from DrmPassthruPlugin 
Change-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401
 2012-03-13 18:54:16 -07:00