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

2050 Commits

Author SHA1 Message Date
Scott Main
febfd26d10 am e125116f: am e4ef3849: Merge "javadoc cleanup for audioeffect" into jb-mr2-dev 
* commit 'e125116fc8767ecf431c80f5659a8a90032acb97':
  javadoc cleanup for audioeffect
 2013-06-04 11:17:14 -07:00
Scott Main
e125116fc8 am e4ef3849: Merge "javadoc cleanup for audioeffect" into jb-mr2-dev 
* commit 'e4ef3849c58225206fd5cba1b33c08968c5e6021':
  javadoc cleanup for audioeffect
 2013-06-04 09:45:32 -07:00
Scott Main
1d154187a9 javadoc cleanup for audioeffect 
Change-Id: I87917309d1da6529e16d72ad2b4ec9ce04d10569
 2013-06-03 17:34:29 -07:00
Andreas Huber
4a02d4c609 am c41a0eff: am be22605d: Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev 
* commit 'c41a0eff938f825ef235b92efa7a31c3b7f8bfb4':
  Listen for HTTP proxy changes and propagate the information to the media
 2013-06-03 08:48:30 -07:00
Andreas Huber
c41a0eff93 am be22605d: Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev 
* commit 'be22605d1eacfb4137b6984b72a3eda004b911a1':
  Listen for HTTP proxy changes and propagate the information to the media
 2013-06-03 08:46:20 -07:00
Andreas Huber
d5f9fa574d Listen for HTTP proxy changes and propagate the information to the media 
framework.

related-to-bug: 8873723

Change-Id: I2a34343f8006fa1b1448a1f047458fd58fe14fda
(cherry picked from commit bfe9154142428aa8abecaf943dfeffc55f411ea7)
 2013-05-31 21:33:13 +00:00
ztenghui
d554dc3643 am 43590eb7: am 4f0002e6: Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev 
* commit '43590eb76cac78f780dd318492c5fe6093e2fa88':
  MediaMuxer sample code update, no functional change
 2013-05-31 11:09:11 -07:00
ztenghui
43590eb76c am 4f0002e6: Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev 
* commit '4f0002e6de601f6727475a3296618120b62d7f12':
  MediaMuxer sample code update, no functional change
 2013-05-31 11:07:35 -07:00
ztenghui
4f0002e6de Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev 2013-05-31 18:05:43 +00:00
ztenghui
34a5b011cd MediaMuxer sample code update, no functional change 
bug:9213533

Change-Id: I0d42ec58576d9fd797dba9c9c9f5ebed1170a818
 2013-05-31 10:50:08 -07:00
Jeff Brown
718aefb6ff am 6474d840: am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 
* commit '6474d8407cb1551608fc403861e11cf514f8558e':
  Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
 2013-05-30 18:02:31 -07:00
Jeff Brown
6474d8407c am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 
* commit '636af7a1cb90bb2f422bc85356d30f5b4e9342e6':
  Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
 2013-05-30 18:00:08 -07:00
Jeff Brown
636af7a1cb Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 2013-05-31 00:54:41 +00:00
Jean-Michel Trivi
905c2b1117 am 7d2e3939: am c1d47c50: Merge "Monitor device rotation" into jb-mr2-dev 
* commit '7d2e3939964fb6512f370059a33206d2c9ec7a0e':
  Monitor device rotation
 2013-05-30 15:15:18 -07:00
Jeff Brown
14507e257a Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity. 
Bug: 9210033
Change-Id: I973c03b3a37e12af72a27c46d7da7fb59a30b606
 2013-05-30 14:44:18 -07:00
Jean-Michel Trivi
7d2e393996 am c1d47c50: Merge "Monitor device rotation" into jb-mr2-dev 
* commit 'c1d47c50d61063dc41214beb93aeea32f77f2550':
  Monitor device rotation
 2013-05-30 09:03:41 -07:00
Jean-Michel Trivi
c1d47c50d6 Merge "Monitor device rotation" into jb-mr2-dev 2013-05-30 16:00:15 +00:00
Lajos Molnar
ddcbb64a2a am fabd32c1: am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 
* commit 'fabd32c1fb353c4e1437f1472de5ec2810bda329':
  android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
 2013-05-29 15:25:35 -07:00
Lajos Molnar
fabd32c1fb am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 
* commit '673903a2759067b29bed7e309211000d365e0ad3':
  android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
 2013-05-29 15:18:48 -07:00
Lajos Molnar
ecca7f60a6 android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG 
SAMPLE_SYNC_FLAG is not used by MediaMuxer; instead,
MediaCodec.BUFFER_FLAG_SYNC_FRAME is used, which has
the same value.

Remove this now, so that users will not have to translate
MediaCodec flags to MediaMuxer flags, even though MediaMuxer
takes in MediaCodec.BufferInfo objects to specify these flags.

Change-Id: I4b2f2039ca16debf4788a530a36bdd06d516f417
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9169479
 2013-05-29 12:08:18 -07:00
Jean-Michel Trivi
bb6f8711a7 Monitor device rotation 
If requested by ro.audio.monitorOrientation property, set orientation
 information as audio system parameter on configuration changes.

Bug 9095903

Change-Id: I669d4084eade3c14feb63f644bdd5b74fddc8857
 2013-05-28 17:33:16 -07:00
Jeff Brown
2feefe01e9 am b7871af2: am 50ab525a: Merge "Add route description API." into jb-mr2-dev 
* commit 'b7871af2fbde70c7cf4812d5710b2729588bac54':
  Add route description API.
 2013-05-17 12:46:08 -07:00
Jeff Brown
b7871af2fb am 50ab525a: Merge "Add route description API." into jb-mr2-dev 
* commit '50ab525af62ef5e1f9cf3433a161f2e874da6116':
  Add route description API.
 2013-05-17 12:44:37 -07:00
Jeff Brown
56d4b744b3 Add route description API. 
Bug: 8175766
Change-Id: I65dbc10fc04f9ff8f6abc1bda23fbf5baa227737
 2013-05-16 14:41:30 -07:00
Jeff Brown
83d551898d am f8e54846: am 9766caed: Merge "Add an API to determine if a route is connecting." into jb-mr2-dev 
* commit 'f8e54846146c234aa9a201f54eea70df93ee56e2':
  Add an API to determine if a route is connecting.
 2013-05-10 16:16:45 -07:00
Jeff Brown
f8e5484614 am 9766caed: Merge "Add an API to determine if a route is connecting." into jb-mr2-dev 
* commit '9766caedf0657615f739d4e441ab9f2fa71aa709':
  Add an API to determine if a route is connecting.
 2013-05-10 16:13:44 -07:00
Jeff Brown
a27b8fb429 Add an API to determine if a route is connecting. 
Bug: 8175766
Change-Id: I54d5f31d4e7d79c471c0e1bbc438cd8ebb4f8a1e
 2013-05-09 21:56:42 -07:00
Jeff Brown
89efc6e6c1 am da58f92b: am b2f6842d: Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev 
* commit 'da58f92bfaf875074656a55103c819e6f4dda341':
  Add an API to allow a callback to request active scans.
 2013-05-09 17:09:24 -07:00
Jeff Brown
1f59cbb20a am 507a3c77: am 2298d68e: Merge "Fix bug managing wifi display routes." into jb-mr2-dev 
* commit '507a3c77d583643f4a884c5d7b0c5e6bce3222bb':
  Fix bug managing wifi display routes.
 2013-05-09 17:09:22 -07:00
Jeff Brown
da58f92bfa am b2f6842d: Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev 
* commit 'b2f6842d5528345e02a91218fbe58c3e0ca8bafb':
  Add an API to allow a callback to request active scans.
 2013-05-09 16:23:43 -07:00
Jeff Brown
507a3c77d5 am 2298d68e: Merge "Fix bug managing wifi display routes." into jb-mr2-dev 
* commit '2298d68e72afa9cf311af394b61f92f75385bbbf':
  Fix bug managing wifi display routes.
 2013-05-09 16:23:40 -07:00
Jeff Brown
66f3b39ec4 Add an API to allow a callback to request active scans. 
This API is needed by the support library media router to ensure
that wifi display routes can be discovered while the route
chooser dialog is open.

Bug: 8175766
Change-Id: I3773773d93384aa4a3c009e71a5444ee8ce37caf
 2013-05-09 14:44:08 -07:00
Jeff Brown
77e59fef24 Fix bug managing wifi display routes. 
We could sometimes crash due to some inconsistencies in the
way the wifi display routes were updates when connecting,
disconnecting or scanning wifi displays.

Bug: 8837094
Change-Id: I10c7ccb163ec33c4ea107dfcb5074741049fe955
 2013-05-09 13:42:57 -07:00
Jeff Tinker
c8b1f82791 am 5adeaeab: am 02f7f449: Merge "Correct java API docs for MediaDrm offline use case" into jb-mr2-dev 
* commit '5adeaeabd62481b529ec5999df481d74033d67f9':
  Correct java API docs for MediaDrm offline use case
 2013-05-08 15:03:23 -07:00
Jeff Tinker
5adeaeabd6 am 02f7f449: Merge "Correct java API docs for MediaDrm offline use case" into jb-mr2-dev 
* commit '02f7f449739ae3429b0bf834cebcb2b1bcade8c1':
  Correct java API docs for MediaDrm offline use case
 2013-05-07 15:38:40 -07:00
Jeff Tinker
ea824eddbc Correct java API docs for MediaDrm offline use case 
Documentation only change, no APIs are affected

Change-Id: I4f3978751928de503f51afa77e0983d4c385ff7b
related-to-bug: 8621588
 2013-05-07 15:01:07 -07:00
Dianne Hackborn
ba50b97cff Add new app ops for various interesting audio service things. 
Media buttons: note when an application tries to take ownership
of the media buttons.
Audio focus: note when an application tries to take audio focus.
Volume levels: note changes to the volume level of the various
streams.

Maybe we should also have some ops for muting streams, soloing
streams, etc?

Change-Id: I79a5d477b0bad4ff61486cdb73ffb1196a674964
 2013-05-06 16:12:12 -07:00
Jeff Tinker
e0eb0e9063 am 9ba564c7: am 48f2b548: Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into jb-mr2-dev 
* commit '9ba564c7e205c4b278be61eec773a90a94451251':
  MediaDrm API: Add two exceptions to handle error path scenarios
 2013-05-01 15:04:36 -07:00
Jeff Tinker
9ba564c7e2 am 48f2b548: Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into jb-mr2-dev 
* commit '48f2b548edf8e276cc89d2c4c2d2936cde46fc95':
  MediaDrm API: Add two exceptions to handle error path scenarios
 2013-05-01 15:03:20 -07:00
Jeff Tinker
1d7c218ba2 MediaDrm API: Add two exceptions to handle error path scenarios 
bug: 8725707
Change-Id: Ia00c495ac591cc2993f4d11ad3480b59833d009e
 2013-04-30 12:39:04 -07:00
Mike Lockwood
322780496f Fix javadoc errors for @deprecated tags with no explanatory comment 
Change-Id: I38a31facf7d4a9cd13645516f25b4305df65c618
 2013-04-29 18:21:25 -07:00
Mike Lockwood
853ad6fbe3 Remove obsolete OMA-DRM support 
Change-Id: Ic6008d4c9f8b9cd9fd4efec070260227af70559c
 2013-04-29 16:48:13 -07:00
Jean-Michel Trivi
0169b26adf am 448c6ca4: am ea236f19: Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev 
* commit '448c6ca48144b324ca1e98962bd5dd06451a355e':
  Identify in logs launch of voice search from key events
 2013-04-23 11:16:22 -07:00
Jean-Michel Trivi
a7473ab28c am cb315af3: am fb0b6a81: Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" into jb-mr2-dev 
* commit 'cb315af34be49859a0bfda6ee808550671a5e416':
  Opt-in mechanism for RemoteControlClient position anti-drift check
 2013-04-23 11:16:03 -07:00
Jean-Michel Trivi
448c6ca481 am ea236f19: Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev 
* commit 'ea236f19e652942a7af384566c70cdd0c7f88c58':
  Identify in logs launch of voice search from key events
 2013-04-23 03:52:12 -07:00
Jean-Michel Trivi
cb315af34b am fb0b6a81: Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" into jb-mr2-dev 
* commit 'fb0b6a817903b42dfc192dc8fa71f5dede024379':
  Opt-in mechanism for RemoteControlClient position anti-drift check
 2013-04-23 03:51:42 -07:00
Jean-Michel Trivi
ea236f19e6 Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev 2013-04-23 01:30:30 +00:00
Jean-Michel Trivi
fb0b6a8179 Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" into jb-mr2-dev 2013-04-22 23:41:04 +00:00
Jean-Michel Trivi
c3c4babf84 Opt-in mechanism for RemoteControlClient position anti-drift check 
RemoteControlClient has an interface for the framework to query
 the playback position. This mechanism is used to detect
 when the estimated position drifts from the real position by
 having the framework regularly poll (every 15s when playing at
 1x) this interface and compare against the estimation.
But this mechanism:
 - should only be used when IRemoteControlDisplay implementation
  care about position display
 - should not be used by default because the implementation of
  the position query interface might involve network traffic
  in some remote media player implementation for instance.

This CL implements an opt-in mechanism to be used by
 implementators of IRemoteControlDisplay, to request the
 anti-drift mechanism to be turned on.

bug 8120740

Change-Id: I1baa3e515546ac41e0ac9c3a41bfa3147ecf3d7f
 2013-04-22 14:15:34 -07:00
Kenny Root
9edfd5f2df am 0f70770b: am b5ec8c14: Change doc comment to match API change 
* commit '0f70770be83b02c36262ad7e05ac5b2040de3fec':
  Change doc comment to match API change
 2013-04-20 21:37:01 -07:00