10048 Commits

Author SHA1 Message Date
Neil Fuller
dce343dc41 Add flags needed to switch Jack to 1.8 for CTS targets
When linking against .jack files that contain 1.8 language
features Jack (currently) requires -D jack.java.source.version=1.8.

"core-tests" includes 1.8 language features.

Bug: 27113322
Bug: 26953739
(cherry-picked from commit a835180b74af2cad853db08e8d41a7b04773759b)

Change-Id: I2be4db6788b14558f74534c24bb007f7fb8b6b67
2016-02-18 14:16:59 +00:00
Dimitry Ivanov
5a06e3747d Add missing liblog dependency
Bug: http://b/27171986
Change-Id: I40b93ac0d4bfacfc38c08b5dbc5d2b3358a976cb
2016-02-12 16:44:33 -08:00
Neil Fuller
2c9d40a06e Add thread safety documentation
An upcoming change will remove "synchronized" from the API docs. This change
documents those cases where the guarantees can be determined from code
inspection.

Bug: 25767152
(cherry-picked from commit bf0dc0fba790cf95f76870c37469703f8f20a57c)

Change-Id: I328b96328e89950b90d537bf0a6a704242de4993
2016-01-15 16:26:26 +00:00
Eino-Ville Talvala
cb299b858f Merge "Replace hard-coded errno values with OsConstants" 2015-12-09 21:14:21 +00:00
Lazar Trsic
8ea56f6851 Replace hard-coded errno values with OsConstants
Errno values have been hard-coded inside java code. On the native side
however, bionic's errno.h is used (through utils/Errors.h). Some of
the numbers are architecture dependent (EOPNOTSUPP, ETIMEDOUT...).

This causes Camera app to crash on MIPS devices. There is a check for
expected errors, in CameraBinderDecorator.throwOnError, but the error
(EOPNOTSUPP) is not recognized and an exception is thrown.

Change-Id: I8bcac8f1ced50c76614f566a6e624967a18a25e1
2015-12-04 12:41:37 +01:00
Eino-Ville Talvala
be1a3f8b66 Merge "Don\'t use timestamps with all zero"
am: 9574e58027

* commit '9574e58027f8edeb539ecedf2988c1a302887807':
  Don't use timestamps with all zero
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
Glenn Kasten
613c63c742 Merge "BluetoothMidiDevice: change write type to support JamStik"
am: 6079b990f1

* commit '6079b990f1461011a9dedb47cc65db1ce062e199':
  BluetoothMidiDevice: change write type to support JamStik
2015-11-02 23:06:04 +00:00
Glenn Kasten
bd32753700 Merge "BLE-MIDI: change binding for BluetoothMidiService"
am: 5831944a6e

* commit '5831944a6e99eff746e70d6ee9532ec3e3f32918':
  BLE-MIDI: change binding for BluetoothMidiService
2015-11-02 23:04:42 +00:00
Glenn Kasten
d8a8500429 Merge "MidiBluetoothService: add new device to HashMap"
am: 9b07ba4bc3

* commit '9b07ba4bc33319d6db8de173a24eb13b2d7f0b50':
  MidiBluetoothService: add new device to HashMap
2015-11-02 23:03:18 +00:00
Glenn Kasten
58f41c3b76 Merge "MidiManager: fix double BTLE callback"
am: bbf34d0bd1

* commit 'bbf34d0bd1bc4f85c9af614291925f5da1fa0459':
  MidiManager: fix double BTLE callback
2015-11-02 23:01:49 +00:00
Glenn Kasten
350dc16475 Merge "MidiService: update listener with current status when registered"
am: d4e9b9e4ac

* commit 'd4e9b9e4ac4196d37b0a5e59867f5a51018f4087':
  MidiService: update listener with current status when registered
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 95129f50c68c734c5ebdf32ff6b8b9c63cc1ada7)
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 7cd06c0b9e087a555d2c5dd4cab5b7eac8497526)
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 e5f722e55c5708c2b48b8c9688c135e451225032)
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 0ca998d79fe95ded26ec4ff0a1e0a8dc4802684b)
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 b2355940e3e697deeecd1b6511cd5094f9dc553a)
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 cd860ac06ca7a46e9638dd741ba731f066705eb5)
2015-10-13 21:31:22 +00:00
Phil Burk
246b66cbcb am 1bc47a6e: am bfaa71bb: am 8e82755d: Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev
* commit '1bc47a6e7020799ae7eb5ee3e91bc452144a3d64':
  BluetoothMidiDevice: change write type to support JamStik
2015-10-13 18:58:26 +00:00
Phil Burk
bfaa71bb31 am 8e82755d: Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev
* commit '8e82755dfdfee837cb73d3db3f6319301d2a5903':
  BluetoothMidiDevice: change write type to support JamStik
2015-10-13 18:43:35 +00:00
Phil Burk
8e82755dfd Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev 2015-10-13 18:36:13 +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 7cd06c0b9e087a555d2c5dd4cab5b7eac8497526)
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
Eric Laurent
ac86c21c4c am 8738d736: am a14d1bd7: am c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev
* commit '8738d736592554d9a814a3cbd676206992fd81a0':
  MidiBluetoothService: add new device to HashMap
2015-10-13 01:41:30 +00:00
Eric Laurent
a14d1bd798 am c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev
* commit 'c1c462cbaa8b65c6240f947de503619482296222':
  MidiBluetoothService: add new device to HashMap
2015-10-13 01:16:56 +00:00
Eric Laurent
c1c462cbaa Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev 2015-10-13 01:09:32 +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
af3e489c1e 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 95129f50c68c734c5ebdf32ff6b8b9c63cc1ada7)
2015-10-12 23:29:46 +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
7688911b9f 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 e5f722e55c5708c2b48b8c9688c135e451225032)
2015-10-12 21:03:30 +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 0ca998d79fe95ded26ec4ff0a1e0a8dc4802684b)
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 b2355940e3e697deeecd1b6511cd5094f9dc553a)
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
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