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

2148 Commits

Author SHA1 Message Date
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
Glenn Kasten
7ffb2fb3da Merge "Fix AOSP issue 9742: Documentation inconsistancy [sic] in AudioTrack" 2013-04-19 22:49:50 +00:00
Jeff Tinker
89249e90fa am 408e6637: am 26a54eca: Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev 
* commit '408e663712b7f807ff1a0859c636e2dc4f53422c':
  Correct algorithm property name and clarify javadoc description of device unique id property.
 2013-04-19 14:38:39 -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
Glenn Kasten
e8c82a3705 Fix AOSP issue 9742: Documentation inconsistancy [sic] in AudioTrack 
See https://code.google.com/p/android/issues/detail?id=9742

Change-Id: I7e1fe0c3ac6e3b9367e4815097549250778766fa
 2013-04-19 11:45:15 -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
b05c3f5ed2 am 0068e00d: am 91695a0c: Merge "Anti-drift in RCC playback position" into jb-mr2-dev 
* commit '0068e00ddc625280ea230ca3fb819e901595c03d':
  Anti-drift in RCC playback position
 2013-04-19 09:00:12 -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
2770caafed am 747847fa: am 56af4f21: Merge "AudioService: SCO audio backward compatibility" into jb-mr2-dev 
* commit '747847fa128ebda5aab1afe15f64a2997cbb0cce':
  AudioService: SCO audio backward compatibility
 2013-04-19 08:45:13 -07: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
Andreas Huber
74312d96e0 am dbc26a86: am 6ead6cca: Merge "Add some documentation to MediaCodecInfo" into jb-mr2-dev 
* commit 'dbc26a867d0a90319b0b016f9d658d9e754d6cb2':
  Add some documentation to MediaCodecInfo
 2013-04-19 08:39:36 -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
d32885bb7f am 4efe71ae: am 45d59a99: Merge "Make MediaDrm APIs public" into jb-mr2-dev 
* commit '4efe71ae55db09a4e3d727175df97d5bcda0449c':
  Make MediaDrm APIs public
 2013-04-18 09:15:45 -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
d5e1495723 am aa4e2462: am e1546df2: Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev 
* commit 'aa4e246271fa837c373b71fbaa671f0cbc336eca':
  Fix message handling in RemoteControlClient
 2013-04-17 14:23:06 -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
4efc5b5cfb am 29b5e170: am 7fa9667f: Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev 
* commit '29b5e1701bdf06861d0eae4a3be05a7012c5e1c6':
  Clarify how release of offline keys is handled in the MediaDrm API
 2013-04-15 13:17:41 -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
Scott Main
085e0f1240 am feb5a728: am fb5e6bbd: Merge "fix javadoc build" into jb-mr2-dev 
* commit 'feb5a72843ffa6df0140a8c1cfa9c42f6612e19f':
  fix javadoc build
 2013-04-15 11:18:11 -07:00
Scott Main
feb5a72843 am fb5e6bbd: Merge "fix javadoc build" into jb-mr2-dev 
* commit 'fb5e6bbd2bf9ad8a71fc798be3ef12b950476f43':
  fix javadoc build
 2013-04-15 11:15:33 -07:00
Scott Main
e63b0609c3 fix javadoc build 
Change-Id: I9b86dda5aea075832d5e165043f45c8d507b5c16
 2013-04-15 11:11:44 -07:00
Jean-Michel Trivi
46863c6dea am 42732e10: am 74e56f19: Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev 
* commit '42732e1037b48e9bf71e9965bc28ddb5d8242fa4':
  Public APIs for media position in RemoteControlClient
 2013-04-15 10:22:42 -07:00
Jean-Michel Trivi
42732e1037 am 74e56f19: Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev 
* commit '74e56f19299cd04e2e6c6a9a19af260551750d6a':
  Public APIs for media position in RemoteControlClient
 2013-04-15 10:19:24 -07:00
Jean-Michel Trivi
74e56f1929 Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev 2013-04-15 17:13:46 +00:00
Andreas Huber
9015e018eb am e813a85c: am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev 
* commit 'e813a85c97f542bbfc306a30ce2ae4c305133203':
  MediaExtractor.setDataSource(...) has always thrown IOExceptions from
 2013-04-15 08:38:28 -07:00
Andreas Huber
a7407ef01e am baf4a057: am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev 
* commit 'baf4a057f8d4b5a97a5b3da276b59c2cd175e4b7':
  Document that MediaPlayer.getDuration() returns an invalid value (-1)
 2013-04-15 08:38:25 -07:00
Andreas Huber
e813a85c97 am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev 
* commit '2de0771da2b6c07f717d62ae4e4be93702af9a43':
  MediaExtractor.setDataSource(...) has always thrown IOExceptions from
 2013-04-15 08:34:37 -07:00
Andreas Huber
baf4a057f8 am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev 
* commit '5c5c3f3abd8a95bf46378fd93b13160ad52e74ff':
  Document that MediaPlayer.getDuration() returns an invalid value (-1)
 2013-04-15 08:34:34 -07:00
Andreas Huber
2de0771da2 Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev 2013-04-15 15:16:27 +00:00
Jean-Michel Trivi
9157477300 Public APIs for media position in RemoteControlClient 
New APIs in android.media.RemoteControlClient to support application
 exposing their current media playback position and speed, and
 let the framework request position changes.

Bug 8120740

Change-Id: Ibfc41f60e279413c26147e3276d96f28b7f506e7
 2013-04-14 12:17:56 -07:00
Jeff Tinker
d8bbfc2750 Clarify how release of offline keys is handled in the MediaDrm API 
bug: 8603820

Change-Id: Ifeda018fbbbb9905e62ee242da2ede1ed89868a2
 2013-04-12 09:57:43 -07:00
Andreas Huber
7cd281c332 Document that MediaPlayer.getDuration() returns an invalid value (-1) 
if no duration information was available.

Change-Id: If064627cca7915f4562b6d61bfd4ceb9a3c9390c
related-to-bug: 8596285
 2013-04-11 11:09:06 -07:00
Andreas Huber
a57da0dc5a MediaExtractor.setDataSource(...) has always thrown IOExceptions from 
within jni code, but failed to document this fact. No more.

Change-Id: If55980616e974637209dea2b7a28b2481b55cea4
related-to-bug: 8470755
 2013-04-11 10:54:55 -07:00
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
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