Commit Graph

4219 Commits

Author SHA1 Message Date
Marco Nelissen
3272cf26c1 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546
am: 6d5bc9a3c2

Change-Id: I8165c2218d0d5de41468f8acff86a720c03d1f52
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

Change-Id: Iceb4edfd80a0a483d28f2624669eff9dd86bfcb8
2017-06-06 23:16:24 +00:00
Marco Nelissen
5181a7ab64 Merge "Close connection before retrying" into lmp-dev
am: a8648ecebb

Change-Id: I744fdb979aa2803b53d3ff6f4e3e72f6f1160d74
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
761a1ed3a6 DO NOT MERGE) ExifInterface: Close the file when an exception happens
am: cb17930077

Change-Id: I4b8f9270f75800e1390c3a840b41316c20ea4aa8
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
bb800841ca DO NOT MERGE) ExifInterface: Provide backward compatibility
am: 7ce9243087

Change-Id: I3d46cccc578160d7da5ff81e0caa09a52a17e9eb
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
865bf88813 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am: 2ee53c82cc

Change-Id: Ifb5d9af5faae122dcd3111a83e69a218bf4e4f3f
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
db9f504522 DO NOT MERGE: Fix CTS regression
am: 90be39c7bb

Change-Id: Ie32ddd18c9342b36b8d989ab4d715b30ff608949
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
aa85bf99ee Merge \"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\" into mnc-dev
am: f4710c174f

Change-Id: Ia8168af573a5aae66b75c11a2c18fd56e8addae3
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
Ian Pedowitz
05ce0c6bb0 Revert "Fix race condition when setting default ringtones"
This reverts commit f2cb9341ff.

Change-Id: I151972052aea47bf8c6823eb8bbf8161c5a7a4f0
2015-11-11 21:38:04 +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
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
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
ca296978e7 Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev 2015-10-12 22:01:03 +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
d890f4f400 MediaActionSound: Fix video stop sound
Bug: 24745252
Change-Id: I803679d52750e09c7fc7b881523becf9259b558b
2015-10-07 15:17:19 -07: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
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
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
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.

Change-Id: I731d01fd652e928ba331fa28bb09cc8234753fbf
2015-08-07 12:57:55 -06: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
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
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
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
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
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