Marco Nelissen
e18e8c4113
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2
...
am: 3272cf26c1
2017-06-06 23:28:27 +00:00
Marco Nelissen
3272cf26c1
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546
...
am: 6d5bc9a3c2
2017-06-06 23:22:14 +00:00
Marco Nelissen
6d5bc9a3c2
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64
...
am: 4b78a79546
2017-06-06 23:16:24 +00:00
Marco Nelissen
5181a7ab64
Merge "Close connection before retrying" into lmp-dev
...
am: a8648ecebb
2017-06-06 23:02:35 +00:00
Marco Nelissen
46132afee7
Close connection before retrying
...
Otherwise the (CTS) server might run out of connections.
Bug: 38391487
Bug: 22771132
Test: build, run CTS, stream music
Change-Id: I92c782a6799ab36eec8df3f7c3217bea667b838a
2017-06-02 22:35:35 +00:00
Sungsoo
e31a44b710
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077
...
am: 761a1ed3a6
2016-10-18 17:35:20 +00:00
Sungsoo
761a1ed3a6
DO NOT MERGE) ExifInterface: Close the file when an exception happens
...
am: cb17930077
2016-10-18 17:29:00 +00:00
Sungsoo
ad74e88f1d
DO NOT MERGE) ExifInterface: Close the file when an exception happens
...
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
2016-10-18 16:18:35 +00:00
Sungsoo
135524f2c5
DO NOT MERGE) ExifInterface: Close the file when an exception happens
...
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
2016-10-18 16:18:15 +00:00
Sungsoo
cb17930077
DO NOT MERGE) ExifInterface: Close the file when an exception happens
...
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
2016-10-19 01:14:51 +09:00
Sungsoo
016c5889bc
DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087
...
am: bb800841ca
2016-10-13 22:01:22 +00:00
Sungsoo
bb800841ca
DO NOT MERGE) ExifInterface: Provide backward compatibility
...
am: 7ce9243087
2016-10-13 21:56:55 +00:00
Sungsoo
7ce9243087
DO NOT MERGE) ExifInterface: Provide backward compatibility
...
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.
Bug: 30936376, Bug: 32068647, Bug: 31319086
Change-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca
2016-10-13 03:29:14 +00:00
Sungsoo
87a9ac70c3
DO NOT MERGE) ExifInterface: Provide backward compatibility
...
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.
Bug: 30936376, Bug: 32068647, Bug: 31319086
Change-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca
2016-10-13 03:28:40 +00:00
Sungsoo
22bd36448e
DO NOT MERGE) ExifInterface: Provide backward compatibility
...
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.
Bug: 30936376, Bug: 32068647, Bug: 31319086
Change-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca
2016-10-13 03:28:16 +00:00
Sungsoo
45e14ffec6
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 2ee53c82cc
...
am: 865bf88813
2016-09-09 22:55:11 +00:00
Sungsoo
865bf88813
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
...
am: 2ee53c82cc
2016-09-09 22:47:06 +00:00
Sungsoo
2ee53c82cc
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
...
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.
Bug: 30936376
Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6
2016-09-08 07:57:56 +00:00
Sungsoo
659275dc30
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
...
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.
Bug: 30936376
Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6
2016-09-08 07:11:04 +00:00
Sungsoo
aebe2347a7
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
...
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.
Bug: 30936376
Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6
2016-09-08 07:10:26 +00:00
Sungsoo Lim
b04c428935
DO NOT MERGE: Fix CTS regression am: 90be39c7bb
...
am: db9f504522
2016-07-29 18:50:29 +00:00
Sungsoo Lim
db9f504522
DO NOT MERGE: Fix CTS regression
...
am: 90be39c7bb
2016-07-29 18:32:49 +00:00
Sungsoo Lim
90be39c7bb
DO NOT MERGE: Fix CTS regression
...
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
2016-07-29 01:02:27 +00:00
Sungsoo Lim
7a92dc9d99
DO NOT MERGE: Fix CTS regression
...
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
2016-07-29 01:01:49 +00:00
Sungsoo Lim
edc9238514
DO NOT MERGE: Fix CTS regression
...
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
2016-07-29 01:00:22 +00:00
Sungsoo Lim
452dc91f2d
Merge \\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\" into mnc-dev am: f4710c174f
...
am: aa85bf99ee
2016-07-19 00:38:54 +00:00
Sungsoo Lim
aa85bf99ee
Merge \"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\" into mnc-dev
...
am: f4710c174f
2016-07-19 00:32:24 +00:00
Sungsoo Lim
98287a6d54
DO NOT MERGE: Remove the use of JHEAD in ExifInterface
...
Bug: 29270469
Change-Id: I6a6c8aeab2a842ff1646316363d614851625e78f
2016-07-18 06:32:37 +00:00
Sungsoo Lim
3261c5f7b3
DO NOT MERGE: Remove the use of JHEAD in ExifInterface
...
Bug: 29270469
Change-Id: Iecc3d22375f6a79a81512419cdde31f720cef07c
2016-07-15 08:34:52 +00:00
Sungsoo Lim
9fffc56cb1
DO NOT MERGE: Remove the use of JHEAD in ExifInterface
...
Bug: 29270469
Change-Id: Iecc3d22375f6a79a81512419cdde31f720cef07c
2016-07-15 08:34:38 +00:00
Andy Hung
94cefd6adb
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 0a887bcd5c
...
am: 7c798c13a7
2015-12-03 19:34:01 +00:00
Andy Hung
7c798c13a7
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
...
am: 0a887bcd5c
2015-12-03 19:24:02 +00:00
Andy Hung
0a887bcd5c
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
...
Sample decoding still occurs in SoundPoolThread
without holding the SoundPool lock.
Bug: 25781119
Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8
(cherry picked from commit 0275a982ab
2015-12-02 23:28: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
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
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
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
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
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
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
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 95129f50c6
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
