Chris Elliott
a6ed5dcd04
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." am: 8e79dae3f6
...
am: 087d30c142
2015-12-02 22:46:11 +00:00
Chris Elliott
8e79dae3f6
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
...
This reverts commit f60491183d
2015-12-02 13:16:46 -08:00
Chris Elliott
1709832d47
Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev am: 50276adde2 am: c54aa0c3f7
...
am: 767e2b39db
2015-12-01 23:37:28 +00:00
Sridhar Vashist
f60491183d
MediaPlayer: Disable acquiring wakelocks based on property.
...
Ignore setWakeMode based on system property.
Wakelocks essential for playback will be held by audioflinger.
Change-Id: I413cd873bf21e1e999dbf89a27802fbe1b6022c7
Signed-off-by: Sridhar Vashist <svashist@motorola.com >
2015-11-23 14:09:25 -08:00
Eino-Ville Talvala
be1a3f8b66
Merge "Don\'t use timestamps with all zero"
...
am: 9574e58027
2015-11-17 02:00:53 +00:00
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
Ian Pedowitz
4f22c781b6
Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev
...
am: 88d4cc1001
2015-11-11 21:46:06 +00:00
Ian Pedowitz
05ce0c6bb0
Revert "Fix race condition when setting default ringtones"
...
This reverts commit f2cb9341ff
2015-11-11 21:38:04 +00:00
Marco Nelissen
02bf433f90
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev
...
am: 83702ec3ed
2015-11-09 21:28:32 +00:00
Marco Nelissen
f2cb9341ff
Fix race condition when setting default ringtones
...
If the device was powered off during first boot, after media scanner
inserted some entries but before the default ringtone settings were
set (or committed to disk), the default settings would not be set
on subsequent boots.
Bug: 18625739
Bug: 22349910
Change-Id: Iff07da59a9c6d53bf2950bd107ee74d02b7f48d6
2015-11-06 10:50:47 -08:00
Glenn Kasten
bd32753700
Merge "BLE-MIDI: change binding for BluetoothMidiService"
...
am: 5831944a6e
2015-11-02 23:04:42 +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
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
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
Wei Jia
92a1b8cab2
am 559f28ec: am d32df662: am de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments.
...
* commit '559f28ec67636f7bed82550be7590db46b47f1d0':
MediaPlayer: remove obsolete function setPlaybackRate from comments.
2015-10-13 22:02:44 +00:00
Wei Jia
d32df6623e
am de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments.
...
* commit 'de612dc1d10d25e017ac911d0e7cca6709bdbb96':
MediaPlayer: remove obsolete function setPlaybackRate from comments.
2015-10-13 21:47:04 +00:00
Wei Jia
de612dc1d1
MediaPlayer: remove obsolete function setPlaybackRate from comments.
...
Bug: 24260668
Change-Id: I20733e52dbd2dab5eb10b4607a1c1aadb93a1332
(cherry picked from commit cd860ac06c
2015-10-13 21:31:22 +00:00
Phil Burk
61cf82778f
am 92ae0a54: am 7bbb6fed: am 977fe03b: BLE-MIDI: change binding for BluetoothMidiService
...
* commit '92ae0a5480f8ac2107688bf2f6bb58d49cb52bd1':
BLE-MIDI: change binding for BluetoothMidiService
2015-10-13 18:21:44 +00:00
Phil Burk
7bbb6fedbc
am 977fe03b: BLE-MIDI: change binding for BluetoothMidiService
...
* commit '977fe03b36a7783f9cee8497efe550a69b128473':
BLE-MIDI: change binding for BluetoothMidiService
2015-10-13 18:10:29 +00:00
Ronghua Wu
f807c4fc9e
am c2fd35f7: am 57c332bd: am c024de3c: media: ignore null InputStream
...
* commit 'c2fd35f7ae51d83b3d8f7f46c70e351bf0f18235':
media: ignore null InputStream
2015-10-13 15:50:57 +00:00
Ronghua Wu
57c332bd4a
am c024de3c: media: ignore null InputStream
...
* commit 'c024de3c946c18e8e4799eb8d372fdec3146f8cf':
media: ignore null InputStream
2015-10-13 15:40:48 +00:00
Phil Burk
977fe03b36
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-10-13 15:40:03 +00:00
Ronghua Wu
c024de3c94
media: ignore null InputStream
...
Bug: 22854896
Change-Id: I20b9e28bbba6dec73538ee6937d337c2e2b971f4
2015-10-13 15:29:42 +00:00
Phil Burk
42fcca169c
am ff1e8f7e: am 1b3eb741: am ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev
...
* commit 'ff1e8f7eeeb037a296d1fe49600927b5665fe8b7':
MidiManager: fix double BTLE callback
2015-10-13 00:20:17 +00:00
Phil Burk
ae885d6520
am 69ddaafa: am 0a64b146: am e39def48: MidiService: update listener with current status when registered
...
* commit '69ddaafac41a21b35b226ee22e189b9e7840e70f':
MidiService: update listener with current status when registered
2015-10-13 00:20:06 +00:00
Phil Burk
1b3eb741b5
am ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev
...
* commit 'ca296978e7f2a1f70b8dca32b1db9372c2392458':
MidiManager: fix double BTLE callback
2015-10-12 22:04:43 +00:00
Phil Burk
ca296978e7
Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev
2015-10-12 22:01:03 +00:00
Phil Burk
0a64b146d0
am e39def48: MidiService: update listener with current status when registered
...
* commit 'e39def480fd2d1bcc3a89751dd492d4634c38194':
MidiService: update listener with current status when registered
2015-10-12 21:35:12 +00:00
Phil Burk
afa038c074
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-10-12 21:01:35 +00:00
Phil Burk
e39def480f
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-10-12 20:59:57 +00: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
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
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
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
