Mark Goldstein
673a2df291
Update the exception description for start(). am: ac06177a13 am: 8b137cc06b
...
am: fd88989486
Change-Id: I9fef1f2ba9ca5db9b46ea67e2507a682b249c595
2017-02-11 01:38:34 +00:00
Mark Goldstein
8b137cc06b
Update the exception description for start().
...
am: ac06177a13
Change-Id: I124d99971918daa7768d79daa01ecbbb86f60199
2017-02-11 01:29:27 +00:00
Mark Goldstein
ac06177a13
Update the exception description for start().
...
Bug: 31592353
Change-Id: Ic325a8004a87b71c0b43d02db58d4717b4b3831d
2017-02-10 13:22:24 -08:00
Elliot Waite
28ba4722a9
Fix @links in reference docs. am: 54de77470d
...
am: ab978c035e
Change-Id: If0d0613362e0ea95cf48eaf9a16d3eea48b589ea
2017-01-26 04:39:57 +00:00
Elliot Waite
ab978c035e
Fix @links in reference docs.
...
am: 54de77470d
Change-Id: Id38c30bad13d6b61ed504a06471b9f197b360f7b
2017-01-26 04:34:57 +00:00
Elliot Waite
54de77470d
Fix @links in reference docs.
...
Change-Id: I40cea46efd80c448640ff69753698fe8404da40b
2017-01-25 17:00:55 -08:00
qinzhichao
80713e98f7
Merge "Fix NullPointerException in MediaPlayer" am: c7c899bbe2
...
am: 15c9c1f8d1
Change-Id: I313f483e69e098252cf1b753aa5f6b38945d9669
2017-01-04 17:32:20 +00:00
qinzhichao
30d4a498c4
Fix NullPointerException in MediaPlayer
...
Issue detail:
https://code.google.com/p/android/issues/detail?id=231417
setSubtitleAnchor() is a synchronized method and has checked
mSubtitleController. So checking for null pointer is not
needed in scanInternalSubtitleTracks() method.
Signed-off-by: qinzhichao <qinzhichao@xiaomi.com >
2017-01-04 14:51:33 +08:00
Pavlin Radoslavov
da3de76bdb
Merge "Add a mechanism for configuring the A2DP Source codecs" am: 63270f2b96
...
am: 8b46f87e7e
Change-Id: I39e4b90491f646887200649954b652d9f5439925
2017-01-04 03:44:40 +00:00
Pavlin Radoslavov
44a4ef0aa9
Add a mechanism for configuring the A2DP Source codecs
...
* Added a new class BluetoothCodecConfig that contains codec-related
configuration or capabilities: codec type, priority, sample rate,
bits per sample, channel mode, and codec specific fields.
* Extended the Bluetooth A2DP AIDL interface to get/set the current
codec configuration
* Added new call handleBluetoothA2dpDeviceConfigChange() to the Media
Framework that is called when there are changes in the
Bluetooth A2DP device configuration - e.g., the A2DP codec is changed.
Test: A2DP streaming to headsets, TestPlans/71390
Bug: 30958229
Change-Id: I9a82716cbc2a5efbe77352a031ac80c88f6a2459
2017-01-03 17:52:52 -08:00
Alex Klyubin
8e23aa4ee6
Merge "Make users of MtpServer fill in DeviceInfo field values" am: 933ea68aca
...
am: e988e8f1f6
Change-Id: Icce6e31723d4dac12cf2c2e389e69c067dd66a91
2016-12-22 19:22:46 +00:00
Alex Klyubin
abdc2b47b3
Make users of MtpServer fill in DeviceInfo field values
...
This is part of weaning apps off accessing system identifiers via
system properties API. Apps should use android.os.Build API instead.
Bug: 33700679
Test: Enable MTP mode then check that mtp-detect output same as before this commit
Change-Id: I4e6696cdee18b9c3e987c432c095911e85a997db
2016-12-21 13:56:28 -08:00
Marco Nelissen
8b1eed4ee8
Merge "Revert "Remove AmrInputStream"" am: e2d8581529
...
am: 01cb199bed
Change-Id: Icafcabcc2b99dac4d897e0d68725c53e84fdd5c5
2016-12-14 17:05:59 +00:00
Marco Nelissen
a4efbf863b
Revert "Remove AmrInputStream"
...
This reverts commit 0c3518cc77 .
Change-Id: I250d86d2d6ce462cb5f29bc6c312d88a49ac24a4
2016-12-14 16:44:12 +00:00
Marco Nelissen
b10837952a
Merge "Remove AmrInputStream" am: 70b262b0f2
...
am: e57b37e423
Change-Id: Ia95832144e831b91ba0f163db1da8ef8e7033446
2016-12-13 23:28:55 +00:00
Marco Nelissen
0c3518cc77
Remove AmrInputStream
...
Bug: 32114618
Change-Id: I55328e6f003377f4d3c2ba2266844047b1422f49
2016-12-13 13:31:10 -08:00
Jerry Zhang
88672d7d29
Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am: 1975240f17
...
am: 830874dbe7
Change-Id: I930f006ffd7a429379638aa4f8268ed443a3696b
2016-12-13 00:37:12 +00:00
Jerry Zhang
bb598ee16f
Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers.
...
Functionfs requires MtpServer to write descriptors before the device can be
configured. This adds a new configure call that will occur only when
functions are changed (new argument added to updateUsbStateBroadcast for this)
and be called after sys.usb.config is changed but before the waitForState
call to ensure compatibility with configfs devices.
Bug: 30976142
Change-Id: I7e94a5847d3b19c0fd75139e1b15a3f2a1cea01d
Test: Manual
2016-12-12 11:05:32 -08:00
Sungsoo Lim
52dd278eb3
Merge "ExifInterface: fix NegativeArraySizeException" am: c57b472d67
...
am: 582e612fdc
Change-Id: I671ef98f05431e7c4baa2a7b84f6cb04a82c5d9d
2016-12-05 04:47:33 +00:00
Sungsoo Lim
582e612fdc
Merge "ExifInterface: fix NegativeArraySizeException"
...
am: c57b472d67
Change-Id: Ifbe9af9b62837923e6e56159759da6c59795b3aa
2016-12-05 04:41:30 +00:00
NIEJuhu
8708c80cde
ExifInterface: fix NegativeArraySizeException
...
The IFD entry has a 4-byte field COUNT. It is read as int type
and is used as array size by ExifInterface. If a crafted JPEG
file contains a negative value, a NegativeArraySizeException
occurs.
Change-Id: Ief29936400f04636928df09e7f357cbf25345383
Signed-off-by: NIEJuhu <niejuhu@xiaomi.com >
2016-12-02 06:42:58 +00:00
Marco Nelissen
fd91fcc970
Merge "Make AmrInputStream use MediaCodec" am: 866658261f
...
am: 618c1a9ae6
Change-Id: Ic6723d4e2ce7ab401908ca955a785463612509bb
2016-11-11 20:16:00 +00:00
Marco Nelissen
618c1a9ae6
Merge "Make AmrInputStream use MediaCodec"
...
am: 866658261f
Change-Id: Id25833efb8baa54e729bdc823e5849819c53cd64
2016-11-11 20:10:00 +00:00
Marco Nelissen
01d023e966
Make AmrInputStream use MediaCodec
...
Bug: 32114618
Test: ran CTS test
Change-Id: I9fe77689bf0bcd1bc8f6c5a4d62135271c7bef8b
2016-11-11 10:53:09 -08:00
Andy Hung
c6e0d5f125
resolve merge conflicts of ffe502b to cw-f-dev
...
am: 3dd656c624
Change-Id: I8217da44238234d4ba4c34ea76f5bd78fd7b87d2
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
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
Sungsoo
3fc6b8fd0f
ExifInterface: Provide backward compatibility am: 2dbe166801 am: bc813cd510 am: 36f64a2f0c
...
am: b68d0855c4
Change-Id: I40df333d3b19911be333e5c466dfe01a3db4bd70
2016-10-13 22:21:47 +00:00
Sungsoo
b68d0855c4
ExifInterface: Provide backward compatibility am: 2dbe166801 am: bc813cd510
...
am: 36f64a2f0c
Change-Id: Ibc82a2ddd80dff7d98880db0a179fbb1540ac6f8
2016-10-13 22:11:58 +00:00
Sungsoo
36f64a2f0c
ExifInterface: Provide backward compatibility am: 2dbe166801
...
am: bc813cd510
Change-Id: I0aa6d33baeec8dd991561d964bfce16915c0553d
2016-10-13 22:06:01 +00:00
Sungsoo
bc813cd510
ExifInterface: Provide backward compatibility
...
am: 2dbe166801
Change-Id: I53f2bfb056d955c6693cb65c9cb9a21859ff7535
2016-10-13 21:57:22 +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
Erik Wolsheimer
8d135d53cc
Fix memory leak in Ringtone
...
am: 76ed4ddca0
Change-Id: I7c1167593ba2cc960dbb0b57385c574f5c22f2ad
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
Change-Id: I9fdf980a9f60ae97eab64019b6f8e7f5b0e67e2b
2016-10-06 20:05:48 +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
Sungsoo
220f348fb3
Make dispatchAudioRoutesChanged be called when BT A2DP status changed am: 71f3563c39
...
am: 139f1e3742
Change-Id: I381779ef9ac0d285a35984b3e92948edb7a3fa8e
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
Change-Id: Ic6a882104fd7e78886dd0e241a548a94141c653e
2016-09-29 11:17:09 +00:00
Sungsoo
139f1e3742
Make dispatchAudioRoutesChanged be called when BT A2DP status changed
...
am: 71f3563c39
Change-Id: I1ed4f2bfe61feb150091b16817547538539c3285
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
Change-Id: Ie3ceb852d7b78eeb7f7492cafbda205f6f313398
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 .
Bug: 28517884, Bug: 31398128
Change-Id: Ida4a3fc1f6f0aae09a5c4463bca8619412f3db58
2016-09-29 10:15:54 +09:00
Sungsoo
4e236046ae
ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034
...
am: 0a31d58d14
Change-Id: I33726dd0a1bf2f30309e4abd74b8633c809afada
2016-09-28 00:22:55 +00:00
Sungsoo
855b9126e1
ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034
...
am: 6e8eba7238
Change-Id: Ifffb86693778c77a57b2a22387495c0d6cbd1e12
2016-09-28 00:22:53 +00:00
Sungsoo
6e8eba7238
ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3
...
am: d0a8a69034
Change-Id: I1d3369e609d668dc402d4b30eb0c4247980e6e47
2016-09-28 00:18:44 +00:00
Sungsoo
0a31d58d14
ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3
...
am: d0a8a69034
Change-Id: I4df5b4855ec9f1e38fab504f3a895c4744cc287e
2016-09-28 00:15:51 +00:00
Sungsoo
d0a8a69034
ExifInterface: Update javadoc for saveAttributes
...
am: abf5b4cbf3
Change-Id: Icdd289f513f2a576b50d0f3ddf278a1c1710d8b5
2016-09-28 00:08:52 +00:00
Sungsoo
abf5b4cbf3
ExifInterface: Update javadoc for saveAttributes
...
Bug: 31319086
Test: Checked the created javadoc with "make docs"
Change-Id: I97c77ba4f00a95bc5eedf1dcee942aebd2d89ccb
2016-09-27 02:04:35 +00:00
Eino-Ville Talvala
0b0b740e6a
Docs: Note that a Surface acts like a weak reference am: c4faf0cb13
...
am: ca7f4217b8
Change-Id: I42b145bb9139058d2ea349dbb556cd8a2f88724b
2016-09-17 00:47:03 +00:00