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

4221 Commits

Author SHA1 Message Date
Wei Jia
81287d2464 am d385c56d: am 9bf7f2a4: am be30c10e: am a89e9f6d: Merge "MediaSync: fix API comments." into mnc-dev 
* commit 'd385c56dc31a91834e3b3e97c646568be40914bd':
  MediaSync: fix API comments.
 2015-08-06 22:00:08 +00:00
Wei Jia
a89e9f6d32 Merge "MediaSync: fix API comments." into mnc-dev 2015-08-06 21:31:22 +00:00
Wei Jia
5d177fff2f MediaSync: fix API comments. 
Bug: 23008551

Change-Id: Ifbf1970c174b54a761d4672d954ee5633adbf3d6
 2015-08-06 12:51:36 -07:00
Paul Mclean
0d1d5ffb15 am 97f294f5: am 5ccd64b4: am 80688be6: am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev 
* commit '97f294f5a65fb7bc2a87acac56db7b576ca5e5de':
  Consider channel index masks when calculating channel counts.
 2015-08-06 19:28:34 +00:00
Paul Mclean
b751d0e5c9 am 1b8f8ac8: am 4463053e: am a154b332: am c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev 
* commit '1b8f8ac8fe3ca775219a49f7c53dc4af52583033':
  Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
 2015-08-06 19:28:28 +00:00
Paul Mclean
af7748efb6 Merge "Consider channel index masks when calculating channel counts." into mnc-dev 2015-08-06 18:59:06 +00:00
Paul Mclean
c770b7a537 Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev 2015-08-06 18:58:33 +00:00
Paul McLean
8b2562b14c Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test. 
Bug: 22792346
Change-Id: I8a10eb68368ede4baa0d2fd0d71cfff2fced4b75
 2015-08-06 10:03:13 -06:00
Paul Mclean
4164e30270 am 29e678b9: am eda52f0a: am 4d1128b2: am 8eaf18b0: Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev 
* commit '29e678b9c77fa75232b4b9e147430a920e6f6cc4':
  Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices.
 2015-08-05 21:20:45 +00:00
Paul Mclean
8eaf18b0ab Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev 2015-08-05 20:50:29 +00:00
Phil Burk
a0f6759424 am 8d5e35ad: am 65b33c92: am 7cc0cda1: am 881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev 
* commit '8d5e35ad8129e19b64bf1ecbe58764863fb4633c':
  MidiManager: use ConcurrentHashMap
 2015-08-05 20:17:37 +00:00
Paul McLean
22cfec3cb8 Documenting behavior of returning a 0-length array for formats, 
channels, rates queries for analog devices.

Bug: 22729461
Change-Id: I3cb1d586f6264e3627cbb0261a3b2c74ca51cf6b
 2015-08-05 14:06:28 -06:00
Phil Burk
881cd15519 Merge "MidiManager: use ConcurrentHashMap" into mnc-dev 2015-08-05 19:43:21 +00:00
Paul McLean
3115960bde Consider channel index masks when calculating channel counts. 
Bug: 22874806
Change-Id: I04b74f5939bb81350d9e37b9629f8bbc242bffe7
 2015-08-05 09:03:51 -06:00
Phil Burk
a95faf78bf MidiManager: use ConcurrentHashMap 
So that adding and removing device listeners is thread-safe.

Bug: 22909752
Change-Id: I1369ab53c865b54e6e5eb8ea3e8d437fdd1d7197
Signed-off-by: Phil Burk <philburk@google.com>
 2015-08-04 15:38:55 -07:00
Jean-Michel Trivi
2cfe29e34c am cbda3dc7: am 0ca9e2df: am 4032c94d: am fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev 
* commit 'cbda3dc7c53d6a404b3f37b5609f22844fbdf1d1':
  AudioService: check for audio device connection success
 2015-08-04 21:30:19 +00:00
Jean-Michel Trivi
fc5a4bf0e1 Merge "AudioService: check for audio device connection success" into mnc-dev 2015-08-04 20:45:18 +00:00
Jean-Michel Trivi
6d00e41145 AudioService: check for audio device connection success 
When connecting/disconnecting and audio device, AudioService
  was assuming that the call was always successful through
  AudioSystem.setDeviceConnectionState(). In the case of the
  connection of a wired headset (mic + headphones), this also
  causes A2DP to not be used for media playback.
The connection can fail if the audio device being connected
  is not supported by the platform. But if this failure is
  not taken into account for DEVICE_OUT_WIRED_HEADSET or
  HEADPHONES, A2DP would still be avoided even when an A2DP
  device reconnects at boot.
The fix consists in executing the connection logic only when
  the connection was deemed successful. Nothing is altered
  on the disconnection code path, or the direct connection
  of A2DP.
The javadoc is updated in AudioSystem to indicate the return
  codes to take into account in setDeviceConnectionState().

Bug 22511833

Change-Id: I22f0d2c7d4ab4fb9ee1be2f248907f721596a16f
 2015-08-03 17:26:01 -07:00
Jeff Sharkey
a2a3b91c68 am c30d7327: am b1e54abd: am 591ab090: am 3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev 
* commit 'c30d7327b28584f7d6b282ea3b9188dae536620b':
  Expand ringtone titles to support OGG and FLAC.
 2015-08-03 21:30:54 +00:00
Jeff Sharkey
3ba2bfa7b2 Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev 2015-08-03 20:54:32 +00:00
Jeff Sharkey
449e5fd5f8 Expand ringtone titles to support OGG and FLAC. 
These file types don't have "audio/" MIME type, so check for those
MIME types explicitly.

Bug: 22803550
Change-Id: Ia62f94ad4a19409d6a50462935de005bc572f93a
 2015-08-03 13:51:13 -07:00
Lajos Molnar
57f2d561d4 am 1e891397: am 02159cf3: am 2f501cc0: am 0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev 
* commit '1e891397584a64e5df8cafac7b8db64149dd868d':
  media: Clarify MediaCodec and CodecCapabilities documentation
 2015-08-03 18:52:24 +00:00
Glenn Kasten
0536eef883 am a2f5ed7f: am 4dffe462: am 22057e06: am 37f559be: Merge "Improve getTimestamp documentation" into mnc-dev 
* commit 'a2f5ed7f815a1d2118a1d730578222e05394e79d':
  Improve getTimestamp documentation
 2015-08-01 17:04:45 +00:00
Dianne Hackborn
628b412584 am bc2a8843: am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev 
* commit 'bc2a88431e3dc51e2245cc28e327f11d0c78bd56':
  Change MNC codename to just M.
 2015-08-01 17:04:28 +00:00
Lajos Molnar
afa6ceb5a0 media: Clarify MediaCodec and CodecCapabilities documentation 
Bug: 21932760
Bug: 22847191
Change-Id: Iacd24099a98c73fe4fb50226564690aa9b01c772
 2015-07-31 14:48:47 -07:00
Glenn Kasten
37f559be42 Merge "Improve getTimestamp documentation" into mnc-dev 2015-07-31 18:04:16 +00:00
Dianne Hackborn
c1836bb0f1 Merge "Change MNC codename to just M." into mnc-dev 2015-07-31 17:11:58 +00:00
Ronghua Wu
a23894a2a1 am 6be373de: am fc1bcc37: am 0278f2bf: am e8b7febd: Merge "media: use blocks number to find closest size" into mnc-dev 
* commit '6be373dea441db670291d6019237f3daab105000':
  media: use blocks number to find closest size
 2015-07-31 03:01:10 +00:00
Ronghua Wu
e8b7febd62 Merge "media: use blocks number to find closest size" into mnc-dev 2015-07-31 02:32:53 +00:00
Phil Burk
ca6c2eb12d am 91eb05eb: am 42d2aaa0: am 3eb45836: am 2f1a08e6: Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev 
* commit '91eb05ebcd9e564662cfec7a658618b00e5461ac':
  MIDI docs BTLE: how to open BTLE MIDI devices
 2015-07-30 22:03:05 +00:00
Phil Burk
ab4a555404 am d1261ec8: am de6272a7: am 9d4fad24: am fdcd8216: Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev 
* commit 'd1261ec822325e68bec2a46bf38e2d07c3ed7f9d':
  MIDI package doc: add hasSystemFeature() call
 2015-07-30 22:03:00 +00:00
Phil Burk
3674e1f701 am 854829de: am 4f84e648: am 6bf9b8ca: am 559a2420: Merge "MidiDevice: document that opens can return nulls" into mnc-dev 
* commit '854829deeca86a851ffd2a8f0eec3d11ffd266bc':
  MidiDevice: document that opens can return nulls
 2015-07-30 22:02:54 +00:00
Phil Burk
2f1a08e601 Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev 2015-07-30 21:27:47 +00:00
Phil Burk
fdcd82164f Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev 2015-07-30 21:27:25 +00:00
Phil Burk
559a2420d3 Merge "MidiDevice: document that opens can return nulls" into mnc-dev 2015-07-30 21:26:48 +00:00
Ronghua Wu
e595268e98 media: use blocks number to find closest size 
Bug: 22504214
Change-Id: I056e19ac5fdbdff2c5d297b600210c07ae5ed4f4
 2015-07-30 13:01:20 -07:00
Glenn Kasten
00908b6c69 Improve getTimestamp documentation 
Bug: 18977548
Change-Id: Ia3c2620b27a173ed1a15268ca43c28e6f4e31965
 2015-07-30 10:07:34 -07:00
Phil Burk
3cc1bdbc6e MIDI docs BTLE: how to open BTLE MIDI devices 
Adds crucial information including required permissions,
MIDI UUID, and call to openBluetoothDevice().

Bug: 22606182
Change-Id: I47393bd0ecc2601906f6e50075d694c9cc17c993
Signed-off-by: Phil Burk <philburk@google.com>
 2015-07-29 16:47:12 -07:00
Dianne Hackborn
0e3de6caca Change MNC codename to just M. 
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
 2015-07-29 15:20:21 -07:00
Phil Burk
44d535aaf2 MIDI package doc: add hasSystemFeature() call 
Bug: 22800792
Change-Id: Ib4b3e16e8167191505c31522bbccd521a9807528
Signed-off-by: Phil Burk <philburk@google.com>
 2015-07-29 14:00:09 -07:00
Phil Burk
645a0b2bfe MidiDevice: document that opens can return nulls 
Bug: 22800792
Change-Id: I8d7ca1976e9a8abbabc011d3b2391ad7fe646f83
Signed-off-by: Phil Burk <philburk@google.com>
 2015-07-29 13:39:01 -07:00
Ronghua Wu
7c86f4df71 am cdd81636: am 29bac774: am 9090d3c3: am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev 
* commit 'cdd81636e1938e7c9053648a13e6ccebd2ba9d2f':
  media: fix estimateFrameRatesFor to use correct ratio
 2015-07-29 02:12:38 +00:00
Ronghua Wu
4ef977c08f media: fix estimateFrameRatesFor to use correct ratio 
Bug: 22504214
Change-Id: I5a325ae495b76aadd3fcbb8932d865c2f6322b2a
 2015-07-28 15:08:08 -07:00
Jean-Michel Trivi
78aedaf5f6 am dc9fcc3a: am 938e8e30: am 9f4b7a47: am 7b996853: Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev 
* commit 'dc9fcc3a55e734b2aab1e4754db3b588e1fbfc80':
  MediaPlayer subtitle controller: use debug log instead of warning
 2015-07-24 04:07:18 +00:00
Jean-Michel Trivi
6045865d02 am 5be1cdea: am 2ea36877: am 09c4eaf7: am 7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev 
* commit '5be1cdea1c3ba40edc3e85d66e86370a56726d06':
  RingtoneManager: query results depend on caller permission
 2015-07-24 04:04:41 +00:00
Jae Seo
c109f2212b am e47e3b19: am 8d121cf3: am d8162e47: am eec3d9e3: Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev 
* commit 'e47e3b19021627e62f017c7b8fcca6d91a1fef18':
  TIF: Enable hardware acceleration on overlay
 2015-07-24 04:02:50 +00:00
Jean-Michel Trivi
cab361c9bb MediaPlayer subtitle controller: use debug log instead of warning 
Don't use warning log for debug message.

Bug 22698299

Change-Id: Ibe3526fffffc9a7bdcda83c02fd745325db1238b
 2015-07-23 23:03:45 +00:00
Jean-Michel Trivi
13ceb54a19 RingtoneManager: query results depend on caller permission 
When querying for ringtones, only look for ringtones on external
  storage when the caller has READ_EXTERNAL_STORAGE.
Document this behavior in the javadoc of the affected methods.

Bug 22545684

Change-Id: Iae9c9a4ccaf635da8af2ac289b6b4df1b16c5d11
 2015-07-22 15:48:06 -07:00
Jae Seo
345af96677 TIF: Enable hardware acceleration on overlay 
Bug: 18162541
Change-Id: If57fb26ae88ca6ef701f01cce0e5dfd9c6eb1f0e
 2015-07-22 12:34:17 -07:00
Todd Kennedy
a52d960bc4 am 09395e5e: am 8e0ab997: am 548871f2: am f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev 
* commit '09395e5e18d506432dbfdcb4b076af941c1170e1':
  Use RingtonePlayer to get ringtone title
 2015-07-21 19:04:09 +00:00