Michal Piechowski
43b0a458ab
Don't use timestamps with all zero
...
Although all zero (0000:00:00) is valid time, in most cases it means
that value is not present. According to http://www.exiv2.org/Exif2-2.PDF
in such case those values should be omitted, however
some cameras set them to 0 anyway. With this commit such timestamps
will be treated as they were empty.
Change-Id: I9c762b1fa04ea6bf9c0fba9e2459a20430c71c90
2015-11-13 10:05:06 +09:00
Glenn Kasten
613c63c742
Merge "BluetoothMidiDevice: change write type to support JamStik"
...
am: 6079b990f1
2015-11-02 23:06:04 +00:00
Glenn Kasten
bd32753700
Merge "BLE-MIDI: change binding for BluetoothMidiService"
...
am: 5831944a6e
2015-11-02 23:04:42 +00:00
Glenn Kasten
d8a8500429
Merge "MidiBluetoothService: add new device to HashMap"
...
am: 9b07ba4bc3
2015-11-02 23:03:18 +00:00
Glenn Kasten
58f41c3b76
Merge "MidiManager: fix double BTLE callback"
...
am: bbf34d0bd1
2015-11-02 23:01:49 +00:00
Glenn Kasten
350dc16475
Merge "MidiService: update listener with current status when registered"
...
am: d4e9b9e4ac
2015-11-02 23:00:15 +00:00
Phil Burk
d11e59ec6b
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 >
(cherry picked from commit 95129f50c6
2015-11-02 13:31:29 -08:00
Phil Burk
ff23e1b4cb
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 >
(cherry picked from commit 7cd06c0b9e
2015-11-02 13:31:29 -08:00
Phil Burk
2e48f1b96e
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 >
(cherry picked from commit e5f722e55c
2015-11-02 13:31:29 -08:00
Phil Burk
a471e2cf8c
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 >
(cherry picked from commit 0ca998d79f
2015-11-02 13:31:29 -08:00
Phil Burk
3698fca0dc
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 >
(cherry picked from commit b2355940e3
2015-11-02 13:31:29 -08:00
Chien-Yu Chen
c1a1343933
am d07d0071: am 02e4400c: am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
...
* commit 'd07d007161e2f64e88eba9f78778ab63b3dd6ab9':
MediaActionSound: Fix video stop sound
2015-10-07 23:22:24 +00:00
Chien-Yu Chen
02e4400cc7
am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
...
* commit 'ab7812750bca947abc9e8b1ce73a3041dbc2f2a9':
MediaActionSound: Fix video stop sound
2015-10-07 23:11:20 +00:00
Chien-Yu Chen
d890f4f400
MediaActionSound: Fix video stop sound
...
Bug: 24745252
Change-Id: I803679d52750e09c7fc7b881523becf9259b558b
2015-10-07 15:17:19 -07:00
Neil Fuller
29a631e147
am 08aa3309: am ead371de: Merge "Remove use of \'_\' variable name"
...
* commit '08aa3309790672ccc4c9b899fdf4e6162cfbc37a':
Remove use of '_' variable name
2015-09-30 14:00:17 +00:00
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
ead371ded0
Merge "Remove use of '_' variable name"
2015-09-30 13:48:16 +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
Elliott Hughes
ea1831d211
am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
...
* commit 'b57dd722f1dc0663417da37d3a82f8283ad3c982':
constify JNINativeMethod function pointer tables
2015-09-24 17:14:10 +00:00
Elliott Hughes
b57dd722f1
resolved conflicts for a884d81e to stage-aosp-master
...
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
2015-09-24 10:01:32 -07:00
Daniel Micay
76f6a86de2
constify JNINativeMethod function pointer tables
...
Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
2015-09-22 17:10:35 -04:00
Eric Laurent
4803708270
am 155c1ad1: am 38f6f487: am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp()
...
* commit '155c1ad113dd6ec6bab9fdcb0934db255603237a':
AudioTrack: error reporting for getTimestamp()
2015-08-27 19:22:22 +00:00
Eric Laurent
38f6f487b2
am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp()
...
* commit 'aef51d09ef33eb3f03789c71edc25a7b103728d1':
AudioTrack: error reporting for getTimestamp()
2015-08-27 18:33:41 +00: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 4e1ccd370f
2015-08-27 17:52:38 +00:00
Zach Johnson
fe12a31cbc
am df98fdaf: am 5d636c8c: Merge "Fix AudioAttributes.usageToString() string return values" into cw-e-dev
...
* commit 'df98fdaf2c6165dcd8bfb2ba8fd3e89d729af256':
Fix AudioAttributes.usageToString() string return values
2015-08-25 19:32:23 +00:00
Zach Johnson
fe8b2477d2
Fix AudioAttributes.usageToString() string return values
...
Change-Id: I75642d043d647c921259dad20df504dd2e551644
2015-08-25 11:30:51 -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
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
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
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
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
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 8b2562b14c
2015-08-07 12:57:55 -06: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
