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

1635 Commits

Author SHA1 Message Date
James Dong
c64c1cbef4 am d1a0a53e: am 5d478b9c: Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev 
* commit 'd1a0a53eec141b615697652b3a8907a60298a414':
  Changed to obtain a parcel in each notify() call in jni.
 2012-07-18 20:18:41 -07:00
James Dong
d1a0a53eec am 5d478b9c: Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev 
* commit '5d478b9c1009b077649f7f870d993832d380d63c':
  Changed to obtain a parcel in each notify() call in jni.
 2012-07-18 20:15:11 -07:00
James Dong
5d478b9c10 Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev 2012-07-18 18:43:37 -07:00
Adam Powell
41a48e4a99 am c36b8acd: am 38895394: Merge "Properly switch MediaRouter to wired audio over a2dp." into jb-dev 
* commit 'c36b8acd1e850619de0bbf678b9573d4d761d836':
  Properly switch MediaRouter to wired audio over a2dp.
 2012-07-16 17:36:49 -07:00
Adam Powell
c36b8acd1e am 38895394: Merge "Properly switch MediaRouter to wired audio over a2dp." into jb-dev 
* commit '388953942b536b5eebd942ef78ae5b7499bc2078':
  Properly switch MediaRouter to wired audio over a2dp.
 2012-07-16 17:33:40 -07:00
Adam Powell
bcf21e913a Properly switch MediaRouter to wired audio over a2dp. 
The system gives priority to physically connected
headphones/speakers/docks/etc. Reflect this in MediaRouter and
associated UI.

Bug 6777592

Change-Id: Ibabf3d7512207117e892c99f004443490c3d0612
 2012-07-12 16:53:04 -07:00
Jean-Michel Trivi
f2b0c11f4e Fix sound effect attenuation calculation 
The sound effect volume attenuation calculation is wrong: the
 division by 20 was always returning 1 or 0.
In AudioService, rename the sound effect attenuation value to
 follow the naming conventions for static variables.

Change-Id: I3c36d50f4470ff09ca98cb944aefb5ad0f968782
 2012-07-10 13:24:23 -07:00
Eric Laurent
28b7809e30 Merge "AudioService: fix a2dp force use delay" 2012-07-10 09:46:54 -07:00
Insun Kang
333c09945e Changed to obtain a parcel in each notify() call in jni. 
Change-Id: I5faf0f5d1fdf76a5b4bd1cff37aa58df79d18e85
related-to-bug: 6785452
 2012-07-10 22:23:01 +09:00
Eric Laurent
c390bed06b AudioService: fix a2dp force use delay 
Fixed setBluetoothA2dpOnInt() so that AudioSystem.setForceUse()
is called synchronously and not via a message.

This is because the order in which setForceUse() and setDeviceConnectionState()
are executed is important to avoid audio glitches when called from
onSetWiredDeviceConnectionState().

Bug 6720482.

Change-Id: I09c975d1108fd38f31b047c082acdf944ab790a7
 2012-07-09 10:50:37 -07:00
Scott Main
9b52b9c83d am 7b5488d8: am 099fd80f: docs: add throws notice for isPlaying per external issue 33610 
* commit '7b5488d85d8ed36c42a821fb0064de741cca35c9':
  docs: add throws notice for isPlaying per external issue 33610
 2012-07-03 17:42:37 -07:00
Scott Main
7b5488d85d am 099fd80f: docs: add throws notice for isPlaying per external issue 33610 
* commit '099fd80f984b8493de58bdda8ea05563261b0af2':
  docs: add throws notice for isPlaying per external issue 33610
 2012-07-03 17:39:25 -07:00
Scott Main
099fd80f98 docs: add throws notice for isPlaying 
per external issue 33610

Change-Id: Ibd778cb4ecc5f1717fa007ac069a7b3660ec4794
 2012-07-03 17:32:23 -07:00
Scott Main
f16b211ebf am 00a82605: am f443c5ea: Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev 
* commit '00a82605a17360f5b9005035a75d779a231d5a5c':
  Minor corrections to the javadoc overview to reflect late API changes.
 2012-06-28 12:06:39 -07:00
Scott Main
00a82605a1 am f443c5ea: Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev 
* commit 'f443c5ea2c67285322d4790e5bee4c3c6f6af1ae':
  Minor corrections to the javadoc overview to reflect late API changes.
 2012-06-28 12:04:04 -07:00
Scott Main
f443c5ea2c Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev 2012-06-28 12:00:49 -07:00
Andreas Huber
2ac3f2e285 Minor corrections to the javadoc overview to reflect late API changes. 
Change-Id: If64e7ea0fa9c892d728282e5e18547a4da115989
 2012-06-27 11:46:21 -07:00
Mike Lockwood
68ff8cbc38 am 1524e625: am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev 
* commit '1524e625067da52e1365e4f939d4683edeea2fd5':
  MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
 2012-06-26 17:01:53 -07:00
Mike Lockwood
1524e62506 am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev 
* commit '7017d51e147a0f6ed2370fb79c656c9726304131':
  MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
 2012-06-26 16:59:07 -07:00
Mike Lockwood
7017d51e14 Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev 2012-06-26 16:57:02 -07:00
Mike Lockwood
1e855d98aa MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes 
Bug: 6684451

Change-Id: I90204550ccfcd1b7a5b1973bed2a88e934aae053
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2012-06-26 16:33:05 -07:00
Andreas Huber
7b10a492bc am 6dfd6aec: am c8c5e98b: Merge "Document some of the more common mimetypes to be used when instantiating" into jb-dev 
* commit '6dfd6aec2730bfdde6da646dafa8597a34a17b4e':
  Document some of the more common mimetypes to be used when instantiating
 2012-06-25 14:56:06 -07:00
Andreas Huber
6dfd6aec27 am c8c5e98b: Merge "Document some of the more common mimetypes to be used when instantiating" into jb-dev 
* commit 'c8c5e98b9ea0be4d161382fc537955d505e65a6c':
  Document some of the more common mimetypes to be used when instantiating
 2012-06-25 14:53:07 -07:00
Andreas Huber
68b1a6eed8 Document some of the more common mimetypes to be used when instantiating 
MediaCodec components.

Change-Id: I810507d1d76a28666eb6fb63e3b597d38e5f1389
 2012-06-25 14:38:16 -07:00
Adam Powell
c497bc69e9 am 3c419da6: am dbbfa702: Fix MediaRouter bugs 
* commit '3c419da632c7f332a50e5001331544cb8c919dce':
  Fix MediaRouter bugs
 2012-06-24 14:59:03 -07:00
Adam Powell
3c419da632 am dbbfa702: Fix MediaRouter bugs 
* commit 'dbbfa702a09f6d2d36dee1b552442d04a4673f89':
  Fix MediaRouter bugs
 2012-06-24 14:56:06 -07:00
Adam Powell
dbbfa702a0 Fix MediaRouter bugs 
Fix a bug where a newly added group had no supported types at the time
of callback dispatch, meaning that no registered callbacks would be
invoked.

Fix a bug where subscribed type flags were not updated properly when
re-adding a callback for new types.

Change-Id: I7d9f11b363ebdca692786cec1d432600946e5721
 2012-06-24 14:32:04 -07:00
Adam Powell
0c26f97684 am 3b939b72: am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev 
* commit '3b939b7242f9c4155f4d8b34cb474abc77c6417f':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
 2012-06-23 05:39:23 -07:00
Adam Powell
3b939b7242 am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev 
* commit 'fd3fd482ab6ab67b687696f51fa67714bd36fa49':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
 2012-06-23 05:36:54 -07:00
Adam Powell
f3b653a21c Update route count properly when MediaRouteButton detects 
grouped/ungrouped events

Change-Id: I1b00678cc3b548f347c51c3fcbfce18ecc8fbabe
 2012-06-22 19:22:38 -07:00
Adam Powell
c7be481af1 am fd7ea067: am d7c00d2b: Merge "MediaRouter group volume reporting" into jb-dev 
* commit 'fd7ea06787f0be4def188621888d228f38f3a4d1':
  MediaRouter group volume reporting
 2012-06-21 12:03:55 -07:00
Adam Powell
fd7ea06787 am d7c00d2b: Merge "MediaRouter group volume reporting" into jb-dev 
* commit 'd7c00d2bdd011d3a73faf1c4a5bb8012d24dd648':
  MediaRouter group volume reporting
 2012-06-21 11:52:19 -07:00
Adam Powell
f8ac14a7f5 MediaRouter group volume reporting 
RouteGroups always report back the loudest volume of their component
routes. Maintain this through volume update requests (such as those
reported by volume hard keys) such that each route updates
individually, but the group slider always indicates the loudest value.

Change-Id: I5de4b9048bf55682b6271e9485fe50496a1c97c2
 2012-06-20 23:59:14 -07:00
Adam Powell
a08e6881c5 am ed044cda: am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-dev 
* commit 'ed044cda8f6a7600923eecdec682c449f86e0429':
  Expand volume APIs for MediaRouter
 2012-06-20 22:45:09 -07:00
Adam Powell
ed044cda8f am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-dev 
* commit '09829b71de3a84cb9d1bc0d8aad78dd16daadddf':
  Expand volume APIs for MediaRouter
 2012-06-20 22:35:44 -07:00
Adam Powell
8e37a85bf3 Expand volume APIs for MediaRouter 
Allow applications to set a requested volume level on RouteInfo
objects. If requested for a user route, the app-supplied callback will
be invoked to perform actual volume adjustment.

Change-Id: I856990a0da7292492aa15e6562dbc3d055b848a0
 2012-06-20 22:19:29 -07:00
Jean-Michel Trivi
ecab2aab19 am e44440f4: am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev 
* commit 'e44440f40c6b005dce2eba1b37b3cabe97133152':
  Unhide new API in android.media.MediaRouter for remote playback
 2012-06-20 16:46:55 -07:00
Jean-Michel Trivi
63258b253c am 7fe75d97: am fc178e38: Merge "Asynchronous handling of remote volume updates" into jb-dev 
* commit '7fe75d9759544d9b2eccac19aacb8c3992dfcc02':
  Asynchronous handling of remote volume updates
 2012-06-20 16:46:51 -07:00
Jean-Michel Trivi
e44440f40c am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev 
* commit 'bd6b1820d931ef11fc7fc5b8571a8265c1ed4994':
  Unhide new API in android.media.MediaRouter for remote playback
 2012-06-20 16:43:55 -07:00
Jean-Michel Trivi
7fe75d9759 am fc178e38: Merge "Asynchronous handling of remote volume updates" into jb-dev 
* commit 'fc178e381d3db299901a96461122eb22a4ffb43e':
  Asynchronous handling of remote volume updates
 2012-06-20 16:43:52 -07:00
Jean-Michel Trivi
2cd5d25378 Unhide new API in android.media.MediaRouter for remote playback 
Expose new functionality for handling remote volume in:
 android.media.MediaRouter.RouteInfo
 android.media.MediaRouter.UserRouteInfo
 android.media.MediaRouter.VolumeCallback

Change-Id: I8fd9c92be606364599e65939f318e11c2860bab9
 2012-06-20 14:36:23 -07:00
Jean-Michel Trivi
f98de1e8dd Asynchronous handling of remote volume updates 
Remote playback information updates will be posted from the
 application thread, and sent to AudioService. Because they
 require locking the stack containing the remote playback
 information, the update should happen on AudioService's handler
 thread to avoid lock contention.

Change-Id: Ie04898295e08c16dd8ab5985fd825301e9cf1981
 2012-06-20 13:40:22 -07:00
Jean-Michel Trivi
6009dc014f am b92d2a13: am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into jb-dev 
* commit 'b92d2a13c4ab34862968f47191d2713de3701757':
  Remote volume handling in MediaRouter
 2012-06-20 09:12:59 -07:00
Jean-Michel Trivi
b92d2a13c4 am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into jb-dev 
* commit '18ddb6ce6f3672a24a6f86ee4b28f5baa746bc20':
  Remote volume handling in MediaRouter
 2012-06-20 09:10:18 -07:00
Jean-Michel Trivi
1357012968 Remote volume handling in MediaRouter 
Extend MediaRouter.UserRouteInfo to enable setting playback
 information, which includes volume. When the user route instance
 has a RemoteControlClient, forward any playback information to it.
 Enable specifying a callback to be notified of volume events
 on the route.
Extend MediaRouter.RouteInfo to enable retrieving playback
 information.

Update RemoteControlClient javadoc to reflect which parts of the
 API are not intended to be made public.

Change-Id: I59d728eb61747af6c8c89d53f0faeb07940594c3
 2012-06-19 19:41:35 -07:00
Jean-Michel Trivi
629f051f7d am 586b8ee6: am 2f442304: Merge "Remote volume handling" into jb-dev 
* commit '586b8ee62e0245e3c88ce9db51e1c1c3b4f1fb2c':
  Remote volume handling
 2012-06-19 10:59:15 -07:00
Jean-Michel Trivi
586b8ee62e am 2f442304: Merge "Remote volume handling" into jb-dev 
* commit '2f4423043ffeaf232ec984be03743326f08cdc8a':
  Remote volume handling
 2012-06-19 10:56:28 -07:00
Jean-Michel Trivi
2f4423043f Merge "Remote volume handling" into jb-dev 2012-06-19 10:54:32 -07:00
Adam Powell
e97d222110 am 29a2f84f: am 5bb835a9: Merge "MediaRouter bluetooth a2dp selection" into jb-dev 
* commit '29a2f84fbee96c1bbbcb50eceb17d9b726854146':
  MediaRouter bluetooth a2dp selection
 2012-06-18 21:43:46 -07:00
Adam Powell
29a2f84fbe am 5bb835a9: Merge "MediaRouter bluetooth a2dp selection" into jb-dev 
* commit '5bb835a95942b0b313b2fa4e3f05941e630f9be7':
  MediaRouter bluetooth a2dp selection
 2012-06-18 21:40:19 -07:00