Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
208,266 Commits 3 Branches 0 Tags
04e84bb0ec00ad380613492ecd436e6a76d0ff08
Commit Graph

4244 Commits

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

Change-Id: I5c34b680b1c7abcfd33c8719406516fe796afebb
 2017-06-06 23:33:50 +00:00
Marco Nelissen
e18e8c4113 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 
am: 3272cf26c1

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

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
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
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
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
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
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
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
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
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
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
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
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