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

6912 Commits

Author SHA1 Message Date
Adam Powell
ad7cc9e6df am 66104e1e: am 521eeaef: Merge "Make MediaRouter ignore remembered wifi displays when wifi display is off" into jb-mr2-dev 
* commit '66104e1e19316d2c0a7b978093e2d9166f9cbda4':
  Make MediaRouter ignore remembered wifi displays when wifi display is off
 2013-04-10 16:16:33 -07:00
Adam Powell
66104e1e19 am 521eeaef: Merge "Make MediaRouter ignore remembered wifi displays when wifi display is off" into jb-mr2-dev 
* commit '521eeaefcb4b78a8b571d1a1b4f095d993aea8b6':
  Make MediaRouter ignore remembered wifi displays when wifi display is off
 2013-04-10 16:13:01 -07:00
Adam Powell
615e413a90 Make MediaRouter ignore remembered wifi displays when wifi display is off 
Bug 8417329

Change-Id: Ica9bf1b250be4b72ba32e63d7eb1a6ff0b727961
 2013-04-10 16:04:59 -07:00
Jean-Michel Trivi
04fbed4377 am bb15974b: am 8515256a: Merge "Handle seek requests in AudioService" into jb-mr2-dev 
* commit 'bb15974b72618396e5f04138427b49c22bc90dea':
  Handle seek requests in AudioService
 2013-04-10 09:38:43 -07:00
Jean-Michel Trivi
bb15974b72 am 8515256a: Merge "Handle seek requests in AudioService" into jb-mr2-dev 
* commit '8515256ad477721a97108745da4c86f378f50637':
  Handle seek requests in AudioService
 2013-04-10 09:34:09 -07:00
Jean-Michel Trivi
8515256ad4 Merge "Handle seek requests in AudioService" into jb-mr2-dev 2013-04-10 16:29:18 +00:00
Ying Wang
28af35e8cd resolved conflicts for merge of a976bddd to master 
Change-Id: I64e1cbfb0eee891ce4d1eee40eefdcedcc501f7f
 2013-04-09 23:21:42 -07:00
Ying Wang
a976bddd9c am d8b26d6c: Merge "Add liblog" into jb-mr2-dev 
* commit 'd8b26d6c424741dd09cf70ee88fd237807aaf301':
  Add liblog
 2013-04-09 22:28:51 -07:00
Ying Wang
d685894212 Add liblog 
Bug: 8580410
Change-Id: I746aa8258866508c3a725d0773faf4518096548f
 2013-04-09 21:54:12 -07:00
Jean-Michel Trivi
3fbf67e217 Handle seek requests in AudioService 
AudioService handles seek requests to RemoteControlClients.
Discard old or unprocessed seek requests when handling a new one.
Update javadoc for OnPlaybackPositionUpdateListener interface.

bug 8120740

Change-Id: Id17c2852b24d4b8af85e472a177484b98cfeba05
 2013-04-09 14:37:26 -07:00
Marco Nelissen
574215e1f3 am d563cede: am c4ad3cb0: Merge "Add support for common encryption" into jb-mr2-dev 
* commit 'd563cede5cf4ca2647dcf00775dd0ed1dd08e792':
  Add support for common encryption
 2013-04-08 17:06:03 -07:00
Marco Nelissen
d563cede5c am c4ad3cb0: Merge "Add support for common encryption" into jb-mr2-dev 
* commit 'c4ad3cb07ed76c5697c60285456d9c49675174d9':
  Add support for common encryption
 2013-04-08 16:42:17 -07:00
Marco Nelissen
c4ad3cb07e Merge "Add support for common encryption" into jb-mr2-dev 2013-04-08 23:39:29 +00:00
Marco Nelissen
e20a6d5c47 Add support for common encryption 
Change-Id: I2d56a6a90dff3ce1c37296934fca01b8a2ca0f89
 2013-04-08 14:32:34 -07:00
Dianne Hackborn
e6bec854d5 am 3793b928: am bc948101: Merge "Have audio service clean up new receivers in crashing processes." into jb-mr2-dev 
* commit '3793b92816d940b265468e9f2f071fbf35db534d':
  Have audio service clean up new receivers in crashing processes.
 2013-04-08 13:24:28 -07:00
Dianne Hackborn
3793b92816 am bc948101: Merge "Have audio service clean up new receivers in crashing processes." into jb-mr2-dev 
* commit 'bc948101043b3c4b57eb6e0e2421494fd7c1d41e':
  Have audio service clean up new receivers in crashing processes.
 2013-04-08 13:20:02 -07:00
Dianne Hackborn
bc94810104 Merge "Have audio service clean up new receivers in crashing processes." into jb-mr2-dev 2013-04-08 20:10:37 +00:00
Dianne Hackborn
79f7ec70eb Have audio service clean up new receivers in crashing processes. 
The new media button receiver with only a pending intent (no
component name) could be left hanging if the process that
registered it went away.  These semantically need to be tied
to the calling process's lifetime; we now clean them up when
the calling process goes away.

Also added some additional cleanup of media button receivers
when packages change (updated, cleared).

And on top of that, a new "media" command for doing media
things.  Currently lets you send media keys and monitor
remote display data.

Oh and finally added a new BaseCommand base class for
implementing these command line utilities.

Change-Id: Iba1d56f10bab1eec4a94a7bb1d1c2ae614c8bcf5
 2013-04-08 13:08:37 -07:00
ztenghui
8c75967799 am 34dd708a: am 50b9eb1c: Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-mr2-dev 
* commit '34dd708a21ef49f22877c262e0fec07872624087':
  Update the documentiation for MediaMuxer::writeSampleData()
 2013-04-08 10:31:17 -07:00
ztenghui
34dd708a21 am 50b9eb1c: Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-mr2-dev 
* commit '50b9eb1c7375a87525d44a036337a8ba18eba55b':
  Update the documentiation for MediaMuxer::writeSampleData()
 2013-04-08 10:27:18 -07:00
ztenghui
50b9eb1c73 Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-mr2-dev 2013-04-08 17:22:29 +00:00
Eric Laurent
2f633c83fc am 1a39d1bf: am e8d9d2b3: Merge "AudioService: do not use virtual call for bt sco" into jb-mr2-dev 
* commit '1a39d1bff409e3b75be6590c4b67d428cb4e97d7':
  AudioService: do not use virtual call for bt sco
 2013-04-05 15:46:49 -07:00
Eric Laurent
1a39d1bff4 am e8d9d2b3: Merge "AudioService: do not use virtual call for bt sco" into jb-mr2-dev 
* commit 'e8d9d2b3352bdeba0a455666bda9eb64b75198f7':
  AudioService: do not use virtual call for bt sco
 2013-04-05 15:29:46 -07:00
Eric Laurent
e8d9d2b335 Merge "AudioService: do not use virtual call for bt sco" into jb-mr2-dev 2013-04-05 22:14:13 +00:00
Eric Laurent
25fc29b369 AudioService: do not use virtual call for bt sco 
Do not use startScoUsingVirtualVoiceCall() BluetoothHeadset
API to connect SCO audio. This will cause headsets to act as if an incoming
call was received which is not what we want for voice commands.

Bug 8157702

Change-Id: I271909d4d1f3822758740a8484e3d2d8b4f34c00
 2013-04-05 14:27:13 -07:00
Glenn Kasten
c71b045d88 Merge "Update AudioTrack docs for source sample rate" 2013-04-05 17:41:12 +00:00
Glenn Kasten
a074fcffec am 90771cba: am 564c866b: Merge "Fix AudioTrack.setPlaybackRate() error handling" into jb-mr2-dev 
* commit '90771cbaeddc33963d0f1ac1780953b864a50006':
  Fix AudioTrack.setPlaybackRate() error handling
 2013-04-05 08:54:50 -07:00
Glenn Kasten
90771cbaed am 564c866b: Merge "Fix AudioTrack.setPlaybackRate() error handling" into jb-mr2-dev 
* commit '564c866bdfa0a415bfd34722767836add1517951':
  Fix AudioTrack.setPlaybackRate() error handling
 2013-04-05 08:49:16 -07:00
Glenn Kasten
564c866bdf Merge "Fix AudioTrack.setPlaybackRate() error handling" into jb-mr2-dev 2013-04-05 15:45:15 +00:00
Glenn Kasten
8d7fa13746 Update AudioTrack docs for source sample rate 
Add "source" for sampling rate.
Add "initial" to constructor sample rate parameter.
Abbreviate Hertz to standard Hz.

Unrelated:
 - fix spelling typo
 - add comment to session ID parameter

Change-Id: I0902ba5d77ff21fc961f717c984f28255d5fe9b3
 2013-04-05 08:36:33 -07:00
Jeff Tinker
9e2e8e0b6d am 72e2307c: am 1e0f36cf: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev 
* commit '72e2307c6a84de5770dd1aa2943d3d609d29baf3':
  Implement async event callout from drm plugin to Java app
 2013-04-04 18:26:28 -07:00
Jeff Tinker
72e2307c6a am 1e0f36cf: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev 
* commit '1e0f36cffd8a4399fcd12e25bddde4544992bcb2':
  Implement async event callout from drm plugin to Java app
 2013-04-04 18:23:10 -07:00
Jeff Tinker
1e0f36cffd Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev 2013-04-05 01:16:23 +00:00
Dan Morrill
e4d9a01bfc Phase 1 of refactoring SystemServer. 
SystemServer is currently a monolithic class that brings up key system
services. This change is the first phase of refactoring it to be more
configurable. Specifically, it adds a set of on/off switches used to control
startup of individual services. Future plans include finer grained controls
and a more explicit and consistent startup sequence for these services.

Change-Id: I7299f5ce7d7b74a34eb56dffb788366fbc058532
 2013-04-04 09:49:22 -07:00
Glenn Kasten
f19395db63 Fix AudioTrack.setPlaybackRate() error handling 
CTS expects that setPlaybackRate() returns an error for a static buffer
AudioTrack that has not yet had any data written to the buffer.

Bug: 8181114
Change-Id: I17ba039368468f6ccd1eec5322018bfe420c09c8
 2013-04-03 17:14:14 -07:00
Jean-Michel Trivi
314b25d0fd resolved conflicts for merge of ca762bee to master 
Change-Id: Ib57124c30352b4f6ed66f384b386eb6f49b505c1
 2013-04-03 14:58:48 -07:00
Jean-Michel Trivi
ca762beea4 am 6a570204: Merge "RemoteControlClient receives playback position change requests" into jb-mr2-dev 
* commit '6a5702041f48f868863a0454d7df6cd64eab235d':
  RemoteControlClient receives playback position change requests
 2013-04-03 14:14:49 -07:00
Jean-Michel Trivi
6a5702041f Merge "RemoteControlClient receives playback position change requests" into jb-mr2-dev 2013-04-03 21:11:12 +00:00
Andreas Huber
9c2be9bcb7 am 9a1ff831: am c9a1ca3c: Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM" 
* commit '9a1ff831b755c22e26107a8f446ed02fbde5ccb5':
  MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM
 2013-04-03 13:48:10 -07:00
Andreas Huber
9a1ff831b7 am c9a1ca3c: Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM" 
* commit 'c9a1ca3c1a9f8591b675b980c1e390be8d901b39':
  MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM
 2013-04-03 13:38:34 -07:00
ztenghui
f7d3aae328 Update the documentiation for MediaMuxer::writeSampleData() 
Change-Id: I7a5591c7b14728c1833e6401dcd8f0272c4ee56c
 2013-04-03 13:31:41 -07:00
Jeff Tinker
54cfbd6dc2 Implement async event callout from drm plugin to Java app 
Change-Id: I451b7c6f766aafac39ce432a71ef5a03bffe29f1
 2013-04-03 12:01:59 -07:00
Andreas Huber
c9a1ca3c1a Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM" 2013-04-03 16:09:16 +00:00
Jeff Tinker
6a411bc062 am 30b95a60: am 5c0ce512: Merge "MediaDrm API update" into jb-mr2-dev 
* commit '30b95a606a105bdd2f323da28fcde485a65ebc91':
  MediaDrm API update
 2013-04-02 16:50:40 -07:00
Jeff Tinker
5c0ce512c5 Merge "MediaDrm API update" into jb-mr2-dev 2013-04-02 22:49:19 +00:00
Jean-Michel Trivi
5d26e13281 am 5514aff4: am c3c7b92a: Merge "Clean up role of component name in media button event receiver" into jb-mr2-dev 
* commit '5514aff44d506ce23cd14d73962de335224db707':
  Clean up role of component name in media button event receiver
 2013-04-02 11:04:21 -07:00
Jeff Brown
c4b5572259 am 6c48c431: am 579b0c09: Merge "Fix a doc typo." into jb-mr2-dev 
* commit '6c48c4317e29002281ef18bd706b530986a26964':
  Fix a doc typo.
 2013-04-02 11:03:12 -07:00
Eric Laurent
edd719a9b5 am 756561f1: am 742647c8: Merge "AudioService: removed last audible volume index" into jb-mr2-dev 
* commit '756561f1fc980ac7212141c5a5e27182a94a36d1':
  AudioService: removed last audible volume index
 2013-04-02 11:03:07 -07:00
Jean-Michel Trivi
c3c7b92a81 Merge "Clean up role of component name in media button event receiver" into jb-mr2-dev 2013-04-02 15:54:11 +00:00
Jeff Tinker
16b8cffb28 MediaDrm API update 
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.

Change-Id: Id3f8c706e9e3034b09af8e2a6a2f26bd74a49f93
 2013-04-01 21:59:35 -07:00