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

7106 Commits

Author SHA1 Message Date
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
9766caedf0 Merge "Add an API to determine if a route is connecting." into jb-mr2-dev 2013-05-10 23:10:33 +00:00
Marco Nelissen
2b8ae6f521 am 68c666eb: am 804e618d: Fix build 
* commit '68c666ebb75b7e87ee9773752165351482b49a08':
  Fix build
 2013-05-10 12:46:42 -07:00
Marco Nelissen
bed4301eed am 214c7474: am aad3762f: Merge "Fix build" into jb-mr2-dev 
* commit '214c74747d0ff8219e020c5edc6f12bca923b45a':
  Fix build
 2013-05-10 12:46:39 -07:00
Marco Nelissen
68c666ebb7 am 804e618d: Fix build 
* commit '804e618db6240a6c253c0d3eab2232b1823e217a':
  Fix build
 2013-05-10 12:44:12 -07:00
Marco Nelissen
214c74747d am aad3762f: Merge "Fix build" into jb-mr2-dev 
* commit 'aad3762f1bcc3e90c6f312669caa1115f4714669':
  Fix build
 2013-05-10 12:44:09 -07:00
Marco Nelissen
804e618db6 Fix build 
Change-Id: I2eb54a936630094b4bd9c19a944579670a4e0bb8
 2013-05-10 08:28:36 -07:00
Marco Nelissen
aad3762f1b Merge "Fix build" into jb-mr2-dev 2013-05-10 15:16:27 +00:00
Marco Nelissen
ff9a243797 Fix build 
Change-Id: I4afe65f73d8607a97a561615ebfc34aadfe00b95
 2013-05-10 08:05:15 -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
Eric Laurent
d71bfdabff Merge "Fix BT SCO audio test application." 2013-05-08 17:43:17 +00: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
48f2b548ed Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into jb-mr2-dev 2013-05-01 22:01:16 +00:00
Mike J. Chen
1d507f7b9b am 94264d52: am 2f4cc8ea: Merge "Fix a crash case" into jb-mr2-dev 
* commit '94264d522efcc21ac749a6444fbea90916f575c9':
  Fix a crash case
 2013-05-01 14:04:59 -07:00
Mike J. Chen
94264d522e am 2f4cc8ea: Merge "Fix a crash case" into jb-mr2-dev 
* commit '2f4cc8eacfe819a4f54aa4b0318ad1d31ecc2a40':
  Fix a crash case
 2013-05-01 14:02:32 -07:00
Mike J. Chen
2f4cc8eacf Merge "Fix a crash case" into jb-mr2-dev 2013-05-01 20:59:12 +00:00
Eric Laurent
1b7dba8d50 Fix BT SCO audio test application. 
Catch exceptions when stopping the MediaRecorder in onPause().

Change-Id: I9f8b3dd4f0919cdc1ef21334be177596bfeef88e
 2013-05-01 09:51:16 -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
Nick Kralevich
ee4e9530e0 am 25619b2c: libdrm: fix bad strncpy / snprintf calls 
* commit '25619b2c6b3fd584affe20f34bfbf164a5ddbe7d':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 11:18:59 -07:00
Nick Kralevich
25619b2c6b libdrm: fix bad strncpy / snprintf calls 
Fix the following bugs reported by IOActive:
* GOOGLE-AN01 - Android libdrm drm_parseDM.c Boundary-CRLF Buffer Overflow
* GOOGLE-AN02 - Android libdrm 'drm_parseDM.c' contentType-CRLF Buffer Overflow
* GOOGLE-AN03 - Android libdrm drm_parseDM.c contentID-CRLF Buffer Overflow
* GOOGLE-AN04 - Android libdrm 'parser_dcf.c' Multiple Headers Buffer Overflow
* GOOGLE-AN05 - Android libdrm 'parser_dcf.c' ContentType Buffer Overflow

Bug: 8727221
Change-Id: If386922e907567f54e26897beffaa1cfe4777896
 2013-04-29 10:49:47 -07:00
Mike J. Chen
67a1218477 Fix a crash case 
There's a runtime check for a bad argument, but it is
after the usage of the bad argument.  Move the usage
after the check.

Bug 8687716

Change-Id: Iddfa457951bac69b436a430cda21b5d7a563107b
Signed-off-by: Mike J. Chen <mjchen@google.com>
 2013-04-26 12:39:04 -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