Commit Graph

4227 Commits

Author SHA1 Message Date
Sungsoo
802632d4a8 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077 am: 761a1ed3a6
am: e31a44b710

Change-Id: I6d56c9db2085bf7b14a3a82184ce0efe77479871
2016-10-18 17:41:48 +00:00
Sungsoo
e31a44b710 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077
am: 761a1ed3a6

Change-Id: Ia6679d76895a452267f23dd71096c397c5b48c88
2016-10-18 17:35:20 +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
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
d6508621fc DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca
am: 016c5889bc

Change-Id: I03faa540856ba74aff431e287cecc5995b6037bd
2016-10-13 22:07:20 +00:00
Sungsoo
016c5889bc DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087
am: bb800841ca

Change-Id: I93674ad50daa5c3b7411a87112ad33ce199e71ce
2016-10-13 22:01:22 +00: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
5906630ad7 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 2ee53c82cc am: 865bf88813
am: 45e14ffec6

Change-Id: I1a6d79242b6f972dca5bb7eb6ddd37960b1cd4f9
2016-09-09 23:07:49 +00:00
Sungsoo
45e14ffec6 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 2ee53c82cc
am: 865bf88813

Change-Id: I1a59ad0872c98a416efa7bfc8800d65c01cea3f8
2016-09-09 22:55:11 +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 Lim
e71159c5f7 DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522
am: b04c428935

Change-Id: I5781e7822d050426288bbd42faafff31f098aa99
2016-07-29 19:02:43 +00:00
Sungsoo Lim
b04c428935 DO NOT MERGE: Fix CTS regression am: 90be39c7bb
am: db9f504522

Change-Id: I83a02495ec4116d2bc2001325037f5864bb92c9a
2016-07-29 18:50:29 +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
f78637ff64 Merge \\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\" into mnc-dev am: f4710c174f am: aa85bf99ee
am: 452dc91f2d

Change-Id: Ie64f0351a6cf2e4b07bffd85c6dbbd9d7239ce32
2016-07-19 00:46:16 +00:00
Sungsoo Lim
452dc91f2d Merge \\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\" into mnc-dev am: f4710c174f
am: aa85bf99ee

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

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
Marco Nelissen
7d9fab680e 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
Bug: 25633323
Change-Id: I8ff5d3c4f842297d0675e1f5cbe17c0709a14158
2016-01-12 17:12:36 +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
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

* commit '88d4cc100175a54be3b7d560a91c38197f59f4bf':
  Revert "Fix race condition when setting default ringtones"
2015-11-11 21:46:06 +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
02bf433f90 Merge "Fix race condition when setting default ringtones" into mnc-dr-dev
am: 83702ec3ed

* commit '83702ec3edf3bd17eff90a409cc3cf5efab48cff':
  Fix race condition when setting default ringtones
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
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
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
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
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
fe8b2477d2 Fix AudioAttributes.usageToString() string return values
Change-Id: I75642d043d647c921259dad20df504dd2e551644
2015-08-25 11:30:51 -07: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