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

2067 Commits

Author SHA1 Message Date
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
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
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