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

10101 Commits

Author SHA1 Message Date
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
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
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
c964884eb7 am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '1017f9862fb2cdfbff0abe12ef7d20b657a38e36':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-15 00:54:18 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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