1975 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
0f70770be8 am b5ec8c14: Change doc comment to match API change
* commit 'b5ec8c145d467abbc6eaf3306a5f6725e348ceec':
  Change doc comment to match API change
2013-04-20 21:34:52 -07:00
Kenny Root
b5ec8c145d Change doc comment to match API change
API change in f0d4777473f25847d67fc17fc082fada08cf678d didn't update a
comment to match which caused doc build failures.

Bug: 8603279
Change-Id: I475dc569747ae5d34b4267537370f18446386bb9
2013-04-19 16:57:09 -07:00
Jean-Michel Trivi
924f1b962c Identify in logs launch of voice search from key events
Clearly identify in the logs when AudioService starts one of
 the following two intents in response to long-press on
 the KEYCODE_HEADSETHOOK key: ACTION_WEB_SEARCH and
 ACTION_VOICE_SEARCH_HANDS_FREE.

Bug 8095981

Change-Id: I14ca99533dfb011cdc530c0bafd8104ff2436c7d
2013-04-19 16:25:35 -07:00
Jeff Tinker
408e663712 am 26a54eca: Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev
* commit '26a54ecaa556f72086790caa133e5a8d31652d8a':
  Correct algorithm property name and clarify javadoc description of device unique id property.
2013-04-19 13:35:40 -07:00
Jeff Tinker
f0d4777473 Correct algorithm property name and clarify javadoc description of
device unique id property.

bug: 8603279
Change-Id: If56d568072b3c09e5f63901e285d0eaa3c77ff7a
2013-04-19 10:04:17 -07:00
Jean-Michel Trivi
0068e00ddc am 91695a0c: Merge "Anti-drift in RCC playback position" into jb-mr2-dev
* commit '91695a0cdc0aaab3d3f939d9adb8855938b4f69d':
  Anti-drift in RCC playback position
2013-04-19 08:57:43 -07:00
Jean-Michel Trivi
91695a0cdc Merge "Anti-drift in RCC playback position" into jb-mr2-dev 2013-04-19 15:55:29 +00:00
Eric Laurent
747847fa12 am 56af4f21: Merge "AudioService: SCO audio backward compatibility" into jb-mr2-dev
* commit '56af4f212a21fe08b54de10322e023b09fa125aa':
  AudioService: SCO audio backward compatibility
2013-04-19 08:42:42 -07:00
Eric Laurent
56af4f212a Merge "AudioService: SCO audio backward compatibility" into jb-mr2-dev 2013-04-19 15:39:22 +00:00
Andreas Huber
dbc26a867d am 6ead6cca: Merge "Add some documentation to MediaCodecInfo" into jb-mr2-dev
* commit '6ead6ccac9727993559c9f09f1e8da3c69ee3313':
  Add some documentation to MediaCodecInfo
2013-04-19 08:37:04 -07:00
Jean-Michel Trivi
521e68e76c Anti-drift in RCC playback position
Periodically verify that the reported playback position hasn't
 drifted from the estimated playback position.
If a drift is noticed, re-synchronize registered
 IRemoteControlDisplay implementations.

bug 8120740

Note that this implementation updates the playback position
 of  all IRemoteControlDisplay implementations,
 and always causes the OnGetPlaybackPositionListener to be
 called. This might be undesirable in some circumstances
 and will be addressed in a subsequent CL.

Change-Id: Ib9f40e1b000e912f6c35fa03e41adf81efadc894
2013-04-18 18:01:49 -07:00
Andreas Huber
ba9269a585 Add some documentation to MediaCodecInfo
Change-Id: Ia94cde04af37e46b5d4b9c171dc50112134042b8
related-to-bug: 8657165
2013-04-18 15:27:20 -07:00
Jeff Tinker
4efe71ae55 am 45d59a99: Merge "Make MediaDrm APIs public" into jb-mr2-dev
* commit '45d59a997f639662e4ce427933d81667fee39bcd':
  Make MediaDrm APIs public
2013-04-18 09:11:57 -07:00
Jeff Tinker
45d59a997f Merge "Make MediaDrm APIs public" into jb-mr2-dev 2013-04-18 16:08:37 +00:00
Eric Laurent
c18c9138ce AudioService: SCO audio backward compatibility
After commit 25fc29b3, AudioManager.startBluetoothSco()
does not use virtual voice call mode anymore when starting the
SCO audio connection to the headset.
To help backward compatibility, this change makes that virtual voice call
is used if the request comes from an application targeting a SDK version
before JB MR2. For applications targeted to JB MR2 and above a raw SCO
audio connection is established.

Bug 8157702

Change-Id: If1ded2fd99b7ed76d2435d95ee03659e78a7882a
2013-04-17 17:19:56 -07:00
Jeff Tinker
e1c76bebef Make MediaDrm APIs public
bug: 8603279

Change-Id: I9fab2673867ad413a084933cee7239d13e8b7893
2013-04-17 15:24:48 -07:00
Jean-Michel Trivi
aa4e246271 am e1546df2: Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev
* commit 'e1546df25a7de17195f5b38ca90cad8447c288d0':
  Fix message handling in RemoteControlClient
2013-04-17 14:15:36 -07:00
Jean-Michel Trivi
05e7c2ff8c Fix message handling in RemoteControlClient
Internal message must go through the message queue, not be
  dispatched immediately.
Missing 'break' when handling MSG_SEEK_TO message.
  This was spamming the log with fake error messages.

Bug 8120740

Change-Id: Ib53ec05ef33133637e587eb1b24dac9ea32a5680
2013-04-16 16:14:38 -07:00
Jeff Tinker
29b5e1701b am 7fa9667f: Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev
* commit '7fa9667f63fe84a2d17ce899121f32bfcec98864':
  Clarify how release of offline keys is handled in the MediaDrm API
2013-04-15 13:13:39 -07:00
Jeff Tinker
7fa9667f63 Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev 2013-04-15 20:11:18 +00:00