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

4231 Commits

Author SHA1 Message Date
Neil Fuller
08aa330979 am ead371de: Merge "Remove use of \'_\' variable name" 
* commit 'ead371ded06fcf14b7af86a92100b0c3c92fd320':
  Remove use of '_' variable name
 2015-09-30 13:54:53 +00:00
Neil Fuller
00d6b601e6 Remove use of '_' variable name 
'_' may become invalid in future versions of the Java language
and generates warnings in OpenJDK 8.

Bug: 24494019

Change-Id: Id77c8f003b0fdf295191d2d8dbd5b0b0edde2b44
 2015-09-29 15:22:40 +01:00
Glenn Kasten
b2c6413c70 am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev 
* commit 'd9eef3478ae2bea4d943082aaefd1a4a91a30600':
  MIDI docs: fix buffer allocation
 2015-08-21 23:31:48 +00:00
Phil Burk
bda0caf07b MIDI docs: fix buffer allocation 
Also describe NoteOn more clearly.

Bug: 23303608
Change-Id: I35f88022c854c2eb16ec606e58f28e06c52d18b7
Signed-off-by: Phil Burk <philburk@google.com>
 2015-08-19 18:36:20 -07:00
Eino-Ville Talvala
09c62671e9 am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 
* commit '242ff8a89d851cc5c53b11dadd871fa55e00fbb5':
  Camera: Fix framework bugs with DEPTH-only camera devices
 2015-08-12 20:12:35 +00:00
Eino-Ville Talvala
72064af7e7 Camera: Fix framework bugs with DEPTH-only camera devices 
Mostly due to no standard stream configurations being defined,
and for the correct overrides for DEPTH_POINT_CLOUD format.

Bug: 20537722
Change-Id: I8a18f5f68697a09dcc4d7555e51728193fe7f333
 2015-08-11 15:04:56 -07:00
Paul Mclean
624037df15 am a2e39c6a: Merge "Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API." into mnc-dev 
* commit 'a2e39c6a1197f87cab2712a7776ff9022433b90a':
  Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API.
 2015-08-10 13:49:26 +00:00
Paul Mclean
ef23eb24d5 am beda6e2b: Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."" into mnc-dev 
* commit 'beda6e2b9abf576e7d33b520232d45b34a4ed168':
  Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."
 2015-08-10 13:49:18 +00:00
Paul McLean
1135457a3d Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API. 
Bug: 22729461
Change-Id: Ie581c385af2be16e61fcab5993391ef42f82a7d8
 2015-08-07 14:45:24 -06:00
Paul Mclean
5fa8939d6f Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." 
This reverts commit 8b2562b14c37cd61f9c8e1b21e28cf57ff5b7523.

Change-Id: I731d01fd652e928ba331fa28bb09cc8234753fbf
 2015-08-07 12:57:55 -06:00
Wei Jia
7e75886299 am a89e9f6d: Merge "MediaSync: fix API comments." into mnc-dev 
* commit 'a89e9f6d3207527888d7fab191ddbe92ff68fc79':
  MediaSync: fix API comments.
 2015-08-06 21:37:49 +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
0c3c81ef03 am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev 
* commit 'af7748efb6cf4ecca07ab7a76b678a04387e2e40':
  Consider channel index masks when calculating channel counts.
 2015-08-06 19:06:18 +00:00
Paul Mclean
9048088de5 am c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev 
* commit 'c770b7a537350930dab6489c1e2a6f7e46dc47d1':
  Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
 2015-08-06 19:06:11 +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
f89aedbf8b am 8eaf18b0: Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev 
* commit '8eaf18b0ab77184f16870428258650bd12bb2ea5':
  Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices.
 2015-08-05 21:00:46 +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
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
047fe2a721 am 881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev 
* commit '881cd15519535e493d497fefd857f8fe0236c774':
  MidiManager: use ConcurrentHashMap
 2015-08-05 19:50:46 +00: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
b98166c642 am fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev 
* commit 'fc5a4bf0e1520bf3acd75226d760b8e1d7cdd59f':
  AudioService: check for audio device connection success
 2015-08-04 20:56:03 +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
e2faac0a13 am 3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev 
* commit '3ba2bfa7b280bac76d4d60a7f548c5e06aaca569':
  Expand ringtone titles to support OGG and FLAC.
 2015-08-03 21:03:39 +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
a0426ee22f am 0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev 
* commit '0ca1e98fdf300ddbbccbfce26bba5947109597f1':
  media: Clarify MediaCodec and CodecCapabilities documentation
 2015-08-03 18:27:13 +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
30981ed54f am 37f559be: Merge "Improve getTimestamp documentation" into mnc-dev 
* commit '37f559be42ef7a765c671cc0852289a9d7e047cc':
  Improve getTimestamp documentation
 2015-07-31 18:10:39 +00:00
Glenn Kasten
37f559be42 Merge "Improve getTimestamp documentation" into mnc-dev 2015-07-31 18:04:16 +00:00
Dianne Hackborn
f2269f0454 Change MNC codename to just M. 
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
 2015-07-31 17:19:03 +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
db29b8943d am e8b7febd: Merge "media: use blocks number to find closest size" into mnc-dev 
* commit 'e8b7febd62f899ed8920cbd484e18dea64b3a7ee':
  media: use blocks number to find closest size
 2015-07-31 02:40:30 +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
1742d9261d am 2f1a08e6: Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev 
* commit '2f1a08e601f4fa24e589fc61ea38f80eb264a8f4':
  MIDI docs BTLE: how to open BTLE MIDI devices
 2015-07-30 21:41:33 +00:00
Phil Burk
f661537640 am fdcd8216: Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev 
* commit 'fdcd82164f95699c36e044f90a12b9aa1c4f662f':
  MIDI package doc: add hasSystemFeature() call
 2015-07-30 21:41:26 +00:00
Phil Burk
0f1014aee1 am 559a2420: Merge "MidiDevice: document that opens can return nulls" into mnc-dev 
* commit '559a2420d396ef7a7c7bcab012bef379ad864bff':
  MidiDevice: document that opens can return nulls
 2015-07-30 21:41:19 +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