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

9979 Commits

Author SHA1 Message Date
Phil Burk
100df4788d Merge "MidiService: update listener with current status when registered" 2015-09-22 22:15:14 +00:00
Phil Burk
f7781b913b Merge "BluetoothMidiDevice: change write type to support JamStik" 2015-09-22 22:11:53 +00:00
Phil Burk
b2355940e3 MidiService: update listener with current status when registered 
This will give an app an opportunity to learn whether an input port is busy
before the user tries to connect and then fails.

Bug: 22825043
Change-Id: Ifede60f166dfe66ea15453044fce06f4a8452b18
Signed-off-by: Phil Burk <philburk@google.com>
 2015-09-22 12:45:55 -07:00
Phil Burk
95129f50c6 BluetoothMidiDevice: change write type to support JamStik 
Temporarily use a Request instead of a Command so that the JamStik
will be properly enabled.

Bug: 24207964
Change-Id: I3d11732958c46e6039405b5969d5af0db8032fb9
Signed-off-by: Phil Burk <philburk@google.com>
 2015-09-22 12:30:52 -07:00
Marco Nelissen
2f01c806e0 Stop SoundPool on error instead of continuing 
otherwise we might end up looping forever.

Change-Id: I86e33de5387e3acd148d9bba83d18224bb79fd95
 2015-09-15 12:49:07 -07:00
Aaron Vaage
56abfa5ce6 Merge "Resolving createByteBufferFromABuffer null input" 2015-09-08 21:33:29 +00:00
Phil Burk
7cd06c0b9e BLE-MIDI: change binding for BluetoothMidiService 
Add a remote call addBluetoothDevice() using AIDL.
This was needed because onBind() is only called once.

Bug: 23219556
Bug: 23760886
Change-Id: Id7554ca55d596352d11dbd6ae3e403138a29c864
Signed-off-by: Phil Burk <philburk@google.com>
 2015-09-08 13:48:16 -07:00
Aaron Vaage
e5b641e6ef Resolving createByteBufferFromABuffer null input 
It was found that createByteBufferFromABuffer was recieving a NULL buffer in bug
22726278. Based on returning NULL when buffer->base() == NULL, returning NULL
when buffer == NULL. This does not fix bug 22726278 - but address a problem found
while looking into it.

Bug: 22726278
Change-Id: I933b6a4a535d803576a4cdd7a1ffaf4a428c3201
 2015-09-04 10:16:57 -07:00
Tomasz Mikolajewski
bb430fa930 Remove MtpDocument. 
Change-Id: Ie4b0e55f6ff2c7b323cf767a5ed3d3c61c12734d
 2015-09-01 09:25:30 +09:00
Tomasz Mikolajewski
b80a3cfd05 Add support for uploading files via MTP. 
Change-Id: Id1811ab70cb28be471e0a99999e9ad5380deac49
 2015-08-28 10:50:23 +09:00
Eric Laurent
4a8034caea AudioTrack: error reporting for getTimestamp() 
Add a new getTimestamp() method that returns an error code.

Bug: 21886109.
Bug: 22202349.
Bug: 17548098.

Change-Id: Ib072dd3442de79bab9aca77c3c33b0790b492154
(cherry picked from commit 4e1ccd370fc268f3207c5baee08ac8c943c3fdf9)
 2015-08-27 17:52:38 +00:00
Phil Burk
3b3b22140e Merge "MidiBluetoothService: add new device to HashMap" 2015-08-26 18:50:14 +00:00
Phil Burk
e5f722e55c MidiBluetoothService: add new device to HashMap 
The HashMap is being used but devices never added to the map.

Bug: 23429459
Change-Id: I1da5305a56f5bd48e1c5d9345e721ea8dd2eed4e
Signed-off-by: Phil Burk <philburk@google.com>
 2015-08-25 23:15:17 +00:00
Phil Burk
0ca998d79f MidiManager: fix double BTLE callback 
Stop openBluetoothDevice() from calling its callback twice.

Bug: 23218338
Change-Id: I2e738b22a124c0336c46bef05680a82ee1f59e79
Signed-off-by: Phil Burk <philburk@google.com>
 2015-08-25 23:14:15 +00:00
Zach Johnson
45228bf3e0 Fix AudioAttributes.usageToString() string return values 
Change-Id: I75642d043d647c921259dad20df504dd2e551644
 2015-08-25 00:35:27 +00:00
Eric Laurent
61483d885a Merge "AudioTrack: error reporting for getTimestamp()" 2015-08-24 17:06:32 +00:00
Glenn Kasten
d62b9fc172 am 6136d306: am 0035f2ce: am 403eaaf2: am c445438e: am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev 
* commit '6136d30641aae3f679aa768b7e8ed6d1025510cf':
  MIDI docs: fix buffer allocation
 2015-08-22 01:38:12 +00:00
Eric Laurent
4e1ccd370f AudioTrack: error reporting for getTimestamp() 
Add a new getTimestamp() method that returns an error code.

Bug: 21886109.
Bug: 22202349.
Bug: 17548098.

Change-Id: Ib072dd3442de79bab9aca77c3c33b0790b492154
 2015-08-21 18:11:21 -07:00
Glenn Kasten
6136d30641 am 0035f2ce: am 403eaaf2: am c445438e: am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev 
* commit '0035f2ceba00d1ba52b34b94e491eb6899060902':
  MIDI docs: fix buffer allocation
 2015-08-22 00:41:20 +00:00
Tomasz Mikolajewski
87763e6a91 Wire uploading to MtpDocumentsProvider. 
This patch does not yet allow to upload files, but uploading (creating)
directories already works.

Bug: 22545670
Change-Id: If4d5a53aa26f791475bb1a783e0ac9540d6760c1
 2015-08-20 11:34:44 +09: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
Tomasz Mikolajewski
4a86977e3c Merge "Add API for uploading files to MTP devices." 2015-08-17 14:33:00 +00:00
Eino-Ville Talvala
db86989dfc am 3a94b2d2: am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '3a94b2d22e8346a884b2521f7e7682f2953d1515':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 03:03:29 +00:00
Eino-Ville Talvala
3a94b2d22e am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '028c2e4e264d1d2235e4d0f95d178fdf77510e7e':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 02:55:33 +00:00
Eino-Ville Talvala
5717612ba9 Camera2: Add camera type to getNumberOfCameras. 
Do not list strange cameras in old API; ensure new API gets all
cameras.

Bug: 23194168
Change-Id: Ia1fdffac245525674c913fefb1ec06e9094fe8d3
 2015-08-14 14:52:57 -07:00
Tomasz Mikolajewski
b04990599a Add API for uploading files to MTP devices. 
Bug: 22545670
Change-Id: I038c54db06b7cf780bd027d76693e98c685d57a7
 2015-08-14 13:09:52 +09:00
Eino-Ville Talvala
b92e3968b0 am 159a16ab: am f21ecd03: am 6986410a: am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 
* commit '159a16ab79588d71aee5a10b1a4cd4a7f360ed9d':
  Camera: Fix framework bugs with DEPTH-only camera devices
 2015-08-12 21:02:52 +00:00
Eino-Ville Talvala
159a16ab79 am f21ecd03: am 6986410a: am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 
* commit 'f21ecd037e7d17626416e3247b83ab93d81d2559':
  Camera: Fix framework bugs with DEPTH-only camera devices
 2015-08-12 20:53:52 +00:00
Ronghua Wu
86845c1bc8 media: ignore null InputStream 
Bug: 22854896
Change-Id: I20b9e28bbba6dec73538ee6937d337c2e2b971f4
 2015-08-11 22:51:04 +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
Tomasz Mikolajewski
7fa4e0537a Merge "Add API for streamed reading on MTP devices." 2015-08-11 00:57:08 +00:00
Paul Mclean
8ec87bb167 am ba6fad74: am ac112990: am e6639066: am a2e39c6a: Merge "Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API." into mnc-dev 
* commit 'ba6fad7406fabef6d3fa94043d7f64732fd98726':
  Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API.
 2015-08-10 14:16:52 +00:00
Paul Mclean
bb3228c2d9 am fa63af34: am c81abd9a: am 1d19dc58: am beda6e2b: Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."" into mnc-dev 
* commit 'fa63af340a291532e50b86fd0f4bab3e3060ef36':
  Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."
 2015-08-10 14:16:46 +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
Tomasz Mikolajewski
74d4ff8ab3 Add API for streamed reading on MTP devices. 
The existing APIs required to copy all bytes to memory, which will fail in
case of very large files, like movies.

Bug: 22908937
Change-Id: I23bdcbdbf08b7c1b1017591799bbb94e53249a57
 2015-08-07 11:47:50 +09:00
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