Andy Hung
0564ec9d68
resolve merge conflicts of ffe502b to cw-f-dev am: 3dd656c624
...
am: c6e0d5f125
2016-10-18 20:18:05 +00:00
Andy Hung
c6e0d5f125
resolve merge conflicts of ffe502b to cw-f-dev
...
am: 3dd656c624
2016-10-18 20:11:21 +00:00
Andy Hung
3dd656c624
resolve merge conflicts of ffe502b to cw-f-dev
...
Change-Id: Id392b2e1990dc50b5d2d552f283a11a648d849a1
2016-10-18 11:55:04 -07:00
Sungsoo
802632d4a8
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077 am: 761a1ed3a6
...
am: e31a44b710
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
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
Andy Hung
ffe502bd61
Ringtone: clear the MediaPlayer listener upon completion
...
This breaks a local refcount cycle and allows the Java gc to finalize
the Ringtone and MediaPlayer objects quickly.
Bug: 31811091
Change-Id: I0e5a4a78fdc02cc0c8b7811a1f1a45db3c90a0ff
2016-10-17 18:12:35 -07:00
Philip P. Moltmann
b828b77985
Properly close USB device connection in Mtp device
...
Test: Built
Fixes: 32073045
Change-Id: I05179377532c1bd4dff1f4a4e0e837cb645317e3
2016-10-17 11:19:58 -07:00
Marco Nelissen
e1a81fcc65
Make AmrInputStream use MediaCodec
...
Bug: 32114618
Test: ran CTS test
Change-Id: I9fe77689bf0bcd1bc8f6c5a4d62135271c7bef8b
2016-10-14 14:52:10 +00:00
TreeHugger Robot
1bbdac5eb2
Merge "resolve merge conflicts of 3fc6b8f to master"
2016-10-14 02:50:58 +00:00
Sungsoo
4d3a4132c2
resolve merge conflicts of 3fc6b8f to master
...
Change-Id: I004b34699fd997805d6c37753c48fe1f1d226095
2016-10-14 08:17:19 +09:00
Sungsoo
3fc6b8fd0f
ExifInterface: Provide backward compatibility am: 2dbe166801 am: bc813cd510 am: 36f64a2f0c
...
am: b68d0855c4
2016-10-13 22:21:47 +00:00
Sungsoo
b68d0855c4
ExifInterface: Provide backward compatibility am: 2dbe166801 am: bc813cd510
...
am: 36f64a2f0c
2016-10-13 22:11:58 +00:00
Sungsoo
d6508621fc
DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca
...
am: 016c5889bc
2016-10-13 22:07:20 +00:00
Sungsoo
36f64a2f0c
ExifInterface: Provide backward compatibility am: 2dbe166801
...
am: bc813cd510
2016-10-13 22:06:01 +00:00
Sungsoo
016c5889bc
DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087
...
am: bb800841ca
2016-10-13 22:01:22 +00:00
Sungsoo
bc813cd510
ExifInterface: Provide backward compatibility
...
am: 2dbe166801
2016-10-13 21:57:22 +00:00
Sungsoo
bb800841ca
DO NOT MERGE) ExifInterface: Provide backward compatibility
...
am: 7ce9243087
2016-10-13 21:56:55 +00:00
Jean-Michel Trivi
46d5b820d7
Audio stream types: javadoc fix to indicate they're for volume
...
Fix javadoc for stream types to indicate they are only used for
volume, not to identify streams of audio.
Do not reference AudioSystem in SDK doc.
Test: make offline-sdk-docs
Change-Id: Id7b84db1f22841c47e9d580c9f71f7765c498b9d
2016-10-13 21:38:44 +00:00
Sungsoo
2dbe166801
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: Ifb478db3af820eb846c5373d3a284367da3495a0
2016-10-13 13:06:24 +09: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
Erik Wolsheimer
fdc44dc732
Fix memory leak in Ringtone am: 76ed4ddca0
...
am: 8d135d53cc
2016-10-11 18:31:32 +00:00
Erik Wolsheimer
8d135d53cc
Fix memory leak in Ringtone
...
am: 76ed4ddca0
2016-10-11 18:25:39 +00:00
Erik Wolsheimer
76ed4ddca0
Fix memory leak in Ringtone
...
BUG: 31938615
Change-Id: Ic736f3494b4da95460bdc0cb7857cc9fcc746ab9
2016-10-11 10:13:23 -07:00
Philip P. Moltmann
7db3055bba
Do not access MTP devices when disabled. am: 5201f1e61c
...
am: c950703424
2016-10-06 20:05:48 +00:00
Hangyu Kuang
6c08cfff6b
Merge "media: Unhide mpeg2ts format for streaming output format support."
2016-10-04 17:10:23 +00:00
Mikhail Naganov
1fefc3c75f
Merge "MIDI: fix building of properties for the native side"
2016-10-01 01:11:14 +00:00
Philip P. Moltmann
5201f1e61c
Do not access MTP devices when disabled.
...
The USB data transfer is disabled we should not allow access MTP devices
(e.g.
usb sticks). We have two ways of accessing them: Either by mounting them
or by creating a MTPDevice in an app.
Of course an app could implement implement their own MTPDevice
implementation. In this case we cannot enforce the policy without
completely suppressing all MTP USB devices which would be too
restrictive.
Note: When the policy is set we do _not_ disconnect already connected
MTP devices
Fixes: 31472955
Change-Id: I6080c48c49657102774b2b3b4d89ff030245a266
2016-09-30 22:24:23 +00:00
Hangyu Kuang
5b168a0c54
media: Unhide mpeg2ts format for streaming output format support.
...
Test: Run the camera recorder and output correct mpeg2ts stream.
Bug: 21620607
Change-Id: Ic79758d568e984d55e822d4b6af8716b856dd7da
2016-09-30 13:25:22 -07:00
Mikhail Naganov
33603ae9c5
MIDI: fix building of properties for the native side
...
A couple of MIDI device's properties (related to ALSA) are of int type
and can't be transferred as a string. Fixed the code.
As we whitelist properties that can go into native, there is no need to
expect other type of properties besides ints and strings.
Bug: 25945784
Change-Id: I008731d0ffee60c31be0bfddb15dcd1425e4b88e
Test: using a PoC app
2016-09-29 17:15:22 -07:00
TreeHugger Robot
a92a8cf905
Merge "[RingtoneManager] Remove user id from internal Uri"
2016-09-29 14:03:36 +00:00
Andre Lago
760d27149d
[RingtoneManager] Remove user id from internal Uri
...
Prevent system ringtones from leaking with user id's on them
Test: manual
Change-Id: Ia4492c75211f9637e075450763f201bf24c5bf03
2016-09-29 13:19:21 +01:00
Sungsoo
909371b6f6
Make dispatchAudioRoutesChanged be called when BT A2DP status changed am: 71f3563c39 am: 139f1e3742
...
am: 220f348fb3
2016-09-29 11:27:02 +00:00
Sungsoo
69e48e6181
Revert "Disable selecting the default audio route when a BT route is avaiable" am: fa6f70e225 am: 96942eb2ef
...
am: 727ecf0264
2016-09-29 11:26:11 +00:00
Sungsoo
220f348fb3
Make dispatchAudioRoutesChanged be called when BT A2DP status changed am: 71f3563c39
...
am: 139f1e3742
2016-09-29 11:17:52 +00:00
Sungsoo
727ecf0264
Revert "Disable selecting the default audio route when a BT route is avaiable" am: fa6f70e225
...
am: 96942eb2ef
2016-09-29 11:17:09 +00:00
Sungsoo
139f1e3742
Make dispatchAudioRoutesChanged be called when BT A2DP status changed
...
am: 71f3563c39
2016-09-29 11:04:56 +00:00
Sungsoo
96942eb2ef
Revert "Disable selecting the default audio route when a BT route is avaiable"
...
am: fa6f70e225
2016-09-29 11:04:07 +00:00
TreeHugger Robot
e2782906b5
Merge changes Ic1e2f5e8,Ida4a3fc1 into nyc-mr1-dev
...
* changes:
Make dispatchAudioRoutesChanged be called when BT A2DP status changed
Revert "Disable selecting the default audio route when a BT route is avaiable"
2016-09-29 10:54:20 +00:00
Sungsoo
71f3563c39
Make dispatchAudioRoutesChanged be called when BT A2DP status changed
...
Bug: 28517884, Bug: 31398128
Change-Id: Ic1e2f5e828a772c667caf1408ebfc9b0d7c3f7d4
2016-09-29 10:16:19 +09:00
Sungsoo
fa6f70e225
Revert "Disable selecting the default audio route when a BT route is avaiable"
...
This reverts commit 0d33113196
2016-09-29 10:15:54 +09:00
Sungsoo
e1b15e2117
ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034 am: 6e8eba7238
...
am: 855b9126e1
2016-09-28 00:27:20 +00:00
Sungsoo
4e236046ae
ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034
...
am: 0a31d58d14
2016-09-28 00:22:55 +00:00
Sungsoo
855b9126e1
ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034
...
am: 6e8eba7238
2016-09-28 00:22:53 +00:00
Sungsoo
6e8eba7238
ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3
...
am: d0a8a69034
2016-09-28 00:18:44 +00:00
