OSDN Git Service
Jerry Zhang [Thu, 9 Feb 2017 23:53:50 +0000 (23:53 +0000)]
Merge "Update MtpFfsHandle tests, add new tests for small and partial files"
am:
ddc029afc7
Change-Id: I3fae81a74fa92d7a2ce63e938446c9abd26c27f7
Jerry Zhang [Thu, 9 Feb 2017 23:47:57 +0000 (23:47 +0000)]
Merge "Update MtpFfsHandle tests, add new tests for small and partial files"
Jerry Zhang [Mon, 6 Feb 2017 23:12:17 +0000 (15:12 -0800)]
Update MtpFfsHandle tests, add new tests for small and partial files
Test: Build and run 32 and 64 bit tests
Bug:
34822471
Change-Id: I812e4f27464e385c219c42bf7a76fa702f295f41
Caroline Tice [Wed, 8 Feb 2017 23:31:55 +0000 (23:31 +0000)]
Merge "Fix static analyzer warnings"
am:
9064b2d12a
Change-Id: I3e5ef8860968de0433cc3128ff69434ff0a3e8b1
Treehugger Robot [Wed, 8 Feb 2017 23:28:35 +0000 (23:28 +0000)]
Merge "Fix static analyzer warnings"
Marco Nelissen [Wed, 8 Feb 2017 22:23:06 +0000 (22:23 +0000)]
Merge "Fix divide by zero"
am:
659cb35e19
Change-Id: If8c165000be0c80a4471eda58d2b15619bfe3022
Marco Nelissen [Wed, 8 Feb 2017 22:16:58 +0000 (22:16 +0000)]
Merge "Fix divide by zero"
Marco Nelissen [Wed, 8 Feb 2017 22:03:35 +0000 (14:03 -0800)]
Fix divide by zero
Bug:
35136163
Change-Id: If074a1c4d595489f4ff4ffc0b8c381d1bc658447
Tomasz Wasilczyk [Wed, 8 Feb 2017 20:47:59 +0000 (20:47 +0000)]
Merge "Fix uninitialized pointer dereference when loading default radio module."
am:
94388e4b63
Change-Id: Ie0aa3e5af265e1f5e5ef536ac2fb0d0087c2788f
Tomasz Wasilczyk [Wed, 8 Feb 2017 20:42:23 +0000 (20:42 +0000)]
Merge "Fix uninitialized pointer dereference when loading default radio module."
Caroline Tice [Wed, 8 Feb 2017 19:33:04 +0000 (11:33 -0800)]
Fix static analyzer warnings
It was unhappy about uninitialized values potentially being passed into
calls. The warnings were:
frameworks/av/media/libstagefright/DataSource.cpp:254:22: warning:
Function call argument is an uninitialized value
frameworks/av/media/libstagefright/MPEG4Extractor.cpp:4528:17: warning:
Function call argument is an uninitialized value
(The latter was complaining about both `size` and `offset`)
Bug: None
Test: Still builds; static analyzer is now less unhappy.
Change-Id: If8befe493267a5de20e46787b50d854c49d208a3
Tomasz Wasilczyk [Wed, 8 Feb 2017 17:18:08 +0000 (09:18 -0800)]
Fix uninitialized pointer dereference when loading default radio module.
Test: manual
Change-Id: I6ea492536cabc2574dfc9113ca599865d578fbfe
Marco Nelissen [Tue, 7 Feb 2017 21:53:44 +0000 (21:53 +0000)]
Merge "Fix potential overflows"
am:
a0c1eb865f
Change-Id: I4915dcf9cebb84ad5f9ba28c0fae0a7ba85291ac
Marco Nelissen [Tue, 7 Feb 2017 21:50:23 +0000 (21:50 +0000)]
Merge "Fix potential overflows"
Marco Nelissen [Tue, 7 Feb 2017 18:14:45 +0000 (10:14 -0800)]
Fix potential overflows
Bug:
33402896
Test: played file that triggered overflow
Change-Id: Ibf51bbbd4749377d3e77cf6e53fc66ae33b8ee7c
Jerry Zhang [Mon, 6 Feb 2017 22:37:57 +0000 (22:37 +0000)]
Merge changes I89610b96,I9986cd8c
am:
e4dbaeffd7
Change-Id: Ic545c034d8fe32f0c669645c00d7c577d4a09f0e
Jerry Zhang [Mon, 6 Feb 2017 22:37:56 +0000 (22:37 +0000)]
Retry allocations in case of ENODEV
am:
b4f5426604
Change-Id: Ibc95d5ead472dbeaac7880eab06f9c5ec5d5864e
Jerry Zhang [Mon, 6 Feb 2017 22:37:51 +0000 (22:37 +0000)]
Fix GetPartialObject on FFS
am:
4418030f45
Change-Id: I2aa1ae1d1bbd49f80ffeec1dbbdfc301a3b32562
Treehugger Robot [Mon, 6 Feb 2017 22:33:22 +0000 (22:33 +0000)]
Merge changes I89610b96,I9986cd8c
* changes:
Retry allocations in case of ENODEV
Fix GetPartialObject on FFS
Jerry Zhang [Fri, 3 Feb 2017 02:14:33 +0000 (18:14 -0800)]
Retry allocations in case of ENODEV
Unlike the read() and write() calls, the ioctl() call
does not wait for endpoints to be enabled, which is
problematic if ioctls() are the first calls on the
usb connection, since they may be called before the
endpoints are set up. We'll have to retry if this
causes them to fail.
Bug:
34822471
Test: Change configs to mtp and ptp
Change-Id: I89610b9614c33f0b22535cc68cd0c9b502cb55c9
Jerry Zhang [Sat, 4 Feb 2017 00:31:31 +0000 (16:31 -0800)]
Fix GetPartialObject on FFS
Linux apps use GetPartialObject to access
MTP files directly. Fix file offset handling
as well as lengths shorter than packet size.
Bug:
34822471
Test: Attach photos in Gmail, open directly from device
Change-Id: I9986cd8c70ed261f07e8f96a72e53b87341dd93f
Jerry Zhang [Thu, 2 Feb 2017 23:11:40 +0000 (23:11 +0000)]
Merge "Make Mtp FFS allocations per session rather than per file"
am:
3f6419d0e5
Change-Id: I8a4b7b7134b1426f3c2e1f854618362eea9602c0
Treehugger Robot [Thu, 2 Feb 2017 23:04:38 +0000 (23:04 +0000)]
Merge "Make Mtp FFS allocations per session rather than per file"
Jerry Zhang [Fri, 27 Jan 2017 18:29:59 +0000 (10:29 -0800)]
Make Mtp FFS allocations per session rather than per file
Workloads that send a large number of small files could
repeatedly allocate and free the buffer, causing fragmentation
and eventually running out of allocable memory. Instead
have the allocation be once per MTP session, and retry
with smaller buffers if it fails initially.
Bug:
34741015
Bug:
34822471
Test: Transfer files via MTP
Change-Id: I775376076d3a0c26765b211100830ea0c08450ef
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:31:56 +0000 (20:31 +0000)]
Merge "Use the new radio_metadata wrapper for safer memory management."
am:
f41c781cf4
Change-Id: I77502bb758f0c90921175159ea52d10a44cc2f3f
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:26:06 +0000 (20:26 +0000)]
Merge "Use the new radio_metadata wrapper for safer memory management."
Tomasz Wasilczyk [Mon, 23 Jan 2017 22:36:15 +0000 (14:36 -0800)]
Use the new radio_metadata wrapper for safer memory management.
Bug: b/
34054813
Test: VTS, manual - both done in internal branch
Change-Id: I3ffb246af9a092d19a4f698d89ed0c03daa04431
George Burgess IV [Thu, 26 Jan 2017 21:00:52 +0000 (21:00 +0000)]
Merge "Revert "Fix "Dereference of null pointer" compiler warning.""
am:
edbb04f4a0
Change-Id: If5663f47601e0910c34fd0e50ceb682dcaf5ff7c
George Burgess IV [Thu, 26 Jan 2017 20:56:25 +0000 (20:56 +0000)]
Merge "Revert "Fix "Dereference of null pointer" compiler warning.""
Andrii Kulian [Thu, 26 Jan 2017 20:48:44 +0000 (20:48 +0000)]
Revert "Fix "Dereference of null pointer" compiler warning."
This reverts commit
5bfdce99499ef19f7b74471b8b143c4c04d2d947.
Change-Id: I653a233f32ec80022bb8a6f1418e9b74f46ca131
Caroline Tice [Thu, 26 Jan 2017 20:28:51 +0000 (20:28 +0000)]
Merge "Fix "Dereference of null pointer" compiler warning."
am:
d2862051d0
Change-Id: Icb470344054623197d204d8666941e5d58ea0c06
Treehugger Robot [Thu, 26 Jan 2017 20:15:49 +0000 (20:15 +0000)]
Merge "Fix "Dereference of null pointer" compiler warning."
Caroline Tice [Wed, 7 Dec 2016 04:38:32 +0000 (20:38 -0800)]
Fix "Dereference of null pointer" compiler warning.
This CL fixes the warning:
"frameworks/av/media/libstagefright/codecs/aacenc/src/dyn_bits.c:197:35
warning: Array access (from variable 'sideInfoTab') resutls in a null
pointer dereference"
There's a switch statement that initializes 'sideInfoTab', and it does
not have a default case. The listed cases seem to cover all the valid
types for the switch variable, but since the declared type is basically
'int', it's possible for it to contain some value not covered by the
other cases, hit the non-existant default case, which leaves sideInfoTab
with its initial NULL value, later being dereferenced. This CL fixes
this by adding a default case to the switch statement that complains if
it gets an invalid value.
Bug: None
Test: Compiles without the warning.
Change-Id: I1581b3337b6331a694774da27072dd39992e6218
Jerry Zhang [Thu, 19 Jan 2017 19:28:39 +0000 (19:28 +0000)]
Merge "Keep ScopedEndpointBufferAlloc in variables"
am:
1fba0b75b8
Change-Id: I5def988354b3e46fa5f81ff9ea6906dafcd58438
Jerry Zhang [Thu, 19 Jan 2017 19:24:05 +0000 (19:24 +0000)]
Merge "Keep ScopedEndpointBufferAlloc in variables"
Jerry Zhang [Wed, 18 Jan 2017 20:03:56 +0000 (12:03 -0800)]
Keep ScopedEndpointBufferAlloc in variables
This way they don't immediately destruct. Also
up the logging for an allocation failure and use
posix_madvise to possibly improve memory performance.
Test: Transfer files and verify that allocs are scoped properly
Bug:
30976142
Change-Id: If8d2c03cefcc98a83bbb57618c35337529437f73
Jerry Zhang [Tue, 17 Jan 2017 22:39:09 +0000 (22:39 +0000)]
Merge "Re-add MTP interface string"
am:
58cdf4a1ac
Change-Id: I1a9bbc97b06d355348549a47af7ebacea82207eb
Jerry Zhang [Tue, 17 Jan 2017 22:37:09 +0000 (22:37 +0000)]
Merge "Re-add MTP interface string"
Jerry Zhang [Wed, 11 Jan 2017 23:17:53 +0000 (15:17 -0800)]
Re-add MTP interface string
The string is used in some hosts like Mac to
check for MTP devices.
Test: Connect device
Bug:
30976142
Change-Id: Iac616997dc8afd0bdf03de0d13dee7baa6483904
Mark Salyzyn [Thu, 12 Jan 2017 23:47:37 +0000 (23:47 +0000)]
Merge "liblog: use log/log.h for ALOG macros"
am:
59cfe7de39
Change-Id: Ic961061fc8b320bc6e8525005ade7423d09ad79b
Mark Salyzyn [Thu, 12 Jan 2017 23:44:49 +0000 (23:44 +0000)]
Merge "liblog: use log/log.h for ALOG macros"
qinzhichao [Thu, 12 Jan 2017 23:35:11 +0000 (23:35 +0000)]
Merge "Fix issues crashing with Fatal signal when calling getFormat"
am:
1808b0e3e4
Change-Id: Ie79ccfbf101b3a7144f7a7a80d1af7bdeb53cae5
Treehugger Robot [Thu, 12 Jan 2017 23:31:55 +0000 (23:31 +0000)]
Merge "Fix issues crashing with Fatal signal when calling getFormat"
Mark Salyzyn [Thu, 12 Jan 2017 23:10:27 +0000 (15:10 -0800)]
liblog: use log/log.h for ALOG macros
Test: compile
Bug:
34250038
Change-Id: Ie3b92790df631dbacdd51053264dddeba66913c1
Pavlin Radoslavov [Wed, 11 Jan 2017 19:14:53 +0000 (19:14 +0000)]
Merge "Add missing nullptr checks for data.readCString() strings"
am:
ce961d374f
Change-Id: Id45f58c1c231d5212fc8d1807dbd7255dadfc65f
Treehugger Robot [Wed, 11 Jan 2017 19:04:30 +0000 (19:04 +0000)]
Merge "Add missing nullptr checks for data.readCString() strings"
qinzhichao [Sat, 31 Dec 2016 07:36:18 +0000 (15:36 +0800)]
Fix issues crashing with Fatal signal when calling getFormat
when playing multimedia file, GenericSource::getTrackInfo run in the
NuPlayerDriver thread, and GenericSource::getFormatMeta run in the
Generic thread. they would access the critical resource which is
mMetaData in IMediaSource. There is no lock to protect mMetaData.
Occasionally, SIGSEGV occurs when mMetaData point to a new object.
Instead getting trackInfo in Generic thread.
Bug:
34220591
Signed-off-by: qinzhichao <qinzhichao@xiaomi.com>
Pavlin Radoslavov [Tue, 10 Jan 2017 07:27:29 +0000 (23:27 -0800)]
Add missing nullptr checks for data.readCString() strings
Protect the Audio Policy Manager by adding extra checks
for data.readCString() strings when parsing / decoding
a Binder transaction.
Also:
* Moved audio_is_output_device() / audio_is_input_device() checks
inside handleDeviceConfigChange()
from the AudioPolicyInterface to the AudioPolicyManager
* Removed similar redundant checks inside
AudioPolicyService::setDeviceConnectionState()
Test: code compilation
Change-Id: Ib32a28ba2669b73aaf32b31bb18f41c8dd7d2605
Jerry Zhang [Wed, 11 Jan 2017 00:55:48 +0000 (00:55 +0000)]
Merge "Use FUNCTIONFS_ENDPOINT_ALLOC_BUFFER ioctl to improve performance."
am:
20adbc0003
Change-Id: I7766be5e483a6ca71abf879ee9a7b867657c371a
Jerry Zhang [Wed, 11 Jan 2017 00:50:02 +0000 (00:50 +0000)]
Merge "Use FUNCTIONFS_ENDPOINT_ALLOC_BUFFER ioctl to improve performance."
Jerry Zhang [Fri, 16 Dec 2016 01:07:38 +0000 (17:07 -0800)]
Use FUNCTIONFS_ENDPOINT_ALLOC_BUFFER ioctl to improve performance.
The ioctl preallocates kernel buffers for the read/write syscalls,
reducing memory fragmentation and allowing for larger buffers,
as well as removing the kmalloc overhead.
Test: Manual
Change-Id: I9f5fef1b1625c1a2cda374541d8042f7e0ba78f5
Jack He [Tue, 10 Jan 2017 21:48:35 +0000 (21:48 +0000)]
Merge "Convert Android.mk in libaudioclient to Android.bp"
am:
0da9804f12
Change-Id: Ie7fed077481c70205b16a1050646266a80c49ba0
Treehugger Robot [Tue, 10 Jan 2017 21:39:37 +0000 (21:39 +0000)]
Merge "Convert Android.mk in libaudioclient to Android.bp"
Mark Salyzyn [Tue, 10 Jan 2017 21:13:49 +0000 (21:13 +0000)]
Merge "liblog: use log/log.h for ALOG macros"
am:
06d8feefec
Change-Id: Ib5b1d8dbd98957bb409bece5be84dfb10f4b23fc
Treehugger Robot [Tue, 10 Jan 2017 21:06:23 +0000 (21:06 +0000)]
Merge "liblog: use log/log.h for ALOG macros"
Jack He [Thu, 8 Dec 2016 23:44:14 +0000 (15:44 -0800)]
Convert Android.mk in libaudioclient to Android.bp
* Since system/bt depends on this library, it needs to be converted to
Android.bp before the conversion in system/bt can be continued.
* Majority of work is done by androidmk Android.mk > Android.bp
* Fixed sanitize arguements
* Removed LOCAL_EXPORT_C_INCLUDE_DIRS as Android.bp only supports
exporting sub-directories of current Android.bp file
* Removed frameworks/av/media/libmedia/aidl include path as it no longer
exists and Android.mk failed to check that
* Removed include path for audio-utils as it is being automatically
included when we link against libaudioutils
* Android.mk file must be deleted as a library of the same name can only
be defined once in either Android.bp or Android.mk
* A library defined in Android.bp can be used by either Android.bp or
Android.mk files. However, a library defined in Android.mk cannot be
used by Android.bp file. Therefore, for system/bt to link against this
library in the Android.bp, this library must be converted first
Bug:
32958753
Test: Code compilation, no user visible effect
Change-Id: I2ae87a1151ed4235122c7774096c2dbff8b1fc62
Mark Salyzyn [Tue, 10 Jan 2017 17:08:19 +0000 (09:08 -0800)]
liblog: use log/log.h for ALOG macros
Test: compile
Bug:
30465923
Change-Id: I247151363604714088b6059279702702b4e9f89a
xiahong.bao [Tue, 10 Jan 2017 03:27:33 +0000 (03:27 +0000)]
Merge "MPEG4Write mdhd duration overflow after recording for 15 hours"
am:
98d1217d58
Change-Id: Ie69b03560152df6534a1564adb9c9698a6d4d668
Treehugger Robot [Tue, 10 Jan 2017 03:22:24 +0000 (03:22 +0000)]
Merge "MPEG4Write mdhd duration overflow after recording for 15 hours"
Andy Hung [Sat, 7 Jan 2017 04:03:35 +0000 (04:03 +0000)]
Merge "Add SSE optimization of FIR float filter"
am:
5783c0a053
Change-Id: I2c3472620e572b948406828f00011b47094fb0bd
Andy Hung [Sat, 7 Jan 2017 03:57:08 +0000 (03:57 +0000)]
Merge "Add SSE optimization of FIR float filter"
Dan Albert [Fri, 6 Jan 2017 20:46:44 +0000 (20:46 +0000)]
Merge "Unversion NDK stub libraries."
am:
0b4540f867
Change-Id: Icb81885c0846ee4f4ef24456d90ee46022c0fd00
Treehugger Robot [Fri, 6 Jan 2017 20:39:21 +0000 (20:39 +0000)]
Merge "Unversion NDK stub libraries."
Dan Albert [Fri, 6 Jan 2017 00:00:15 +0000 (16:00 -0800)]
Unversion NDK stub libraries.
The system versions of these libraries aren't versioned yet.
Bug: https://github.com/android-ndk/ndk/issues/278
Test: make ndk
Change-Id: I139f34217c8855a366ecb537bfabf2ca0181e4d3
Mark Salyzyn [Thu, 5 Jan 2017 16:58:48 +0000 (16:58 +0000)]
Merge "stagefright: parseApp check data boundary conditions"
am:
ea73e1aef0
Change-Id: Icd376d02b818001d8b83e7055b3f25469e29aabb
Treehugger Robot [Thu, 5 Jan 2017 16:56:08 +0000 (16:56 +0000)]
Merge "stagefright: parseApp check data boundary conditions"
Jerry Zhang [Thu, 5 Jan 2017 00:13:10 +0000 (00:13 +0000)]
Merge "Fix issue with 32 bit versions of asyncio"
am:
71be3d9a6f
Change-Id: I6d0bb90c36b47ccc8d50c3b38c910ab9943cc69f
Jerry Zhang [Thu, 5 Jan 2017 00:08:57 +0000 (00:08 +0000)]
Merge "Fix issue with 32 bit versions of asyncio"
Jerry Zhang [Tue, 3 Jan 2017 22:41:56 +0000 (14:41 -0800)]
Fix issue with 32 bit versions of asyncio
Assuming 64 bit long offsets caused 32 bit tests
to fail
Test: verified async_io_test passes on 32 and 64 bit
Bug:
33846003
Change-Id: I2db126068037f674beeacd5bc30364010c858350
Robert Shih [Wed, 4 Jan 2017 19:18:14 +0000 (19:18 +0000)]
Merge "HTTPLIVE: do not store hash of malformed M3U8 file"
am:
e8b14c3c5c
Change-Id: I8dcc94b4dca4a10221f383f35be68f15242c6e40
Robert Shih [Wed, 4 Jan 2017 19:07:38 +0000 (19:07 +0000)]
Merge "HTTPLIVE: do not store hash of malformed M3U8 file"
xiahong.bao [Thu, 29 Dec 2016 09:39:22 +0000 (17:39 +0800)]
MPEG4Write mdhd duration overflow after recording for 15 hours
MPEG4Write mdhd duration of AV track is larger than INT32_MAX
after record over 15 hours, so write mdhd box as version 1 type
which enhance duration to 64 bit.
Change-Id: I874b0a0ddfb7fb8f5b0a255345d8605b6c8ebf68
Signed-off-by: xiahong.bao <xiahong.bao@nxp.com>
Mark Salyzyn [Mon, 23 Jun 2014 21:13:22 +0000 (14:13 -0700)]
stagefright: parseApp check data boundary conditions
Test: compile, no poc for boundary violation.
Bug:
34056274
Change-Id: I23f5ccba8f211e01d9a3a741c8ea537b55aab4e2
Pavlin Radoslavov [Thu, 29 Dec 2016 00:04:36 +0000 (00:04 +0000)]
Merge "Add a mechanism for handling audio device configuration change"
am:
549e431947
Change-Id: Ia33a6a9a3f4088f0ca351ad2ffe96c5ebd5d7bf7
Treehugger Robot [Wed, 28 Dec 2016 23:55:28 +0000 (23:55 +0000)]
Merge "Add a mechanism for handling audio device configuration change"
Pavlin Radoslavov [Tue, 27 Dec 2016 02:57:22 +0000 (18:57 -0800)]
Add a mechanism for handling audio device configuration change
* Added new call handleDeviceConfigChange() to the Media Framework.
That call can be used when there are device configuration changes
(e.g., Bluetooth A2DP codec configuration has changed).
* Added new method AudioPolicyManager::handleDeviceConfigChange().
That method toggles the UNAVAILABLE/AVAILABLE connection state of the
device, so it can be reconfigured as appropriate - e.g., the audio
feeding parameters can be updated.
* Fix ALOGVV compilation errors when extra logging is enabled.
Test: A2DP streaming to headsets
Bug:
30958229
Change-Id: I388abbbb3ec4d1a003b441cb0c77e00d80cad668
Mark Salyzyn [Thu, 22 Dec 2016 19:11:37 +0000 (19:11 +0000)]
Merge "Replace cutils/log.h with either android/log.h or log/log.h"
am:
a05da2eea4
Change-Id: Iff7f7223f7db444393daef8a5036645688a80cc6
Alex Klyubin [Thu, 22 Dec 2016 19:08:44 +0000 (19:08 +0000)]
Merge "Make users of MtpServer provide DeviceInfo fields"
am:
b5ee680912
Change-Id: I83b174e262a39aa354f0d610192d9c7486e4fc60
Mark Salyzyn [Thu, 22 Dec 2016 18:26:17 +0000 (18:26 +0000)]
Merge "Replace cutils/log.h with either android/log.h or log/log.h"
Alex Klyubin [Thu, 22 Dec 2016 17:06:06 +0000 (17:06 +0000)]
Merge "Make users of MtpServer provide DeviceInfo fields"
Mark Salyzyn [Thu, 29 Sep 2016 15:48:48 +0000 (08:48 -0700)]
Replace cutils/log.h with either android/log.h or log/log.h
Test: compile
Bug:
31289077
Change-Id: I795a76f978d2213737f1fa908da789c543219b75
Jinguang Dong [Tue, 20 Dec 2016 06:33:39 +0000 (14:33 +0800)]
HTTPLIVE: do not store hash of malformed M3U8 file
From code analysis, we should make sure that M3UParser::initCheck
returns OK then perform hash memcpy. This would prevent NuPlayer from
overlooking a malformed M3U8 and crashing later on a NULL derefernce.
Test: 1 Play http://117.34.15.47/7d.v.iask.com/player/ovs1_idx_chid_1054589_br_400_fn_4_pn_weitv_sig_md5.m3u8
2 mediaserver does not crash
Bug:
33763371
Change-Id: I3d8f5450cdf45288110121973c679c8d58210d5c
Alex Klyubin [Wed, 21 Dec 2016 19:20:22 +0000 (11:20 -0800)]
Make users of MtpServer provide DeviceInfo fields
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: Ic21da7b8e976aaa1abc606a3cb4a1f2bd8698408
Eric Laurent [Tue, 20 Dec 2016 18:51:18 +0000 (18:51 +0000)]
Merge "default no ouput verbose message of APM::AudioPolicyEngine/PFWWrapper"
am:
36a75eeb15
Change-Id: I733b003ed3981762cdfed2713973e3dda0073adf
Eric Laurent [Tue, 20 Dec 2016 16:15:44 +0000 (16:15 +0000)]
Merge "default no ouput verbose message of APM::AudioPolicyEngine/PFWWrapper"
Marco Nelissen [Tue, 20 Dec 2016 00:11:15 +0000 (00:11 +0000)]
Merge "Fix issues with extractor dumpsys"
am:
24cd6995c7
Change-Id: I075dfc9daa01e3202c8054690915c43cb0567cac
Marco Nelissen [Tue, 20 Dec 2016 00:11:01 +0000 (00:11 +0000)]
Merge "Fix potential NULL dereference"
am:
ccf56a09ee
Change-Id: I6476a47b0f5d28731d858cfcc32eb489750e20f1
Treehugger Robot [Tue, 20 Dec 2016 00:05:46 +0000 (00:05 +0000)]
Merge "Fix issues with extractor dumpsys"
Treehugger Robot [Tue, 20 Dec 2016 00:00:33 +0000 (00:00 +0000)]
Merge "Fix potential NULL dereference"
Marco Nelissen [Mon, 19 Dec 2016 22:26:38 +0000 (14:26 -0800)]
Fix potential NULL dereference
Bug:
32875080
Change-Id: I9d6808812e735e58e8b477635441fd92f94f8d25
Marco Nelissen [Mon, 19 Dec 2016 22:06:30 +0000 (14:06 -0800)]
Fix issues with extractor dumpsys
Tracks and descriptions were added to their respective lists in
opposite order, so dumpsys could mix up the format and active
state for a given track. Also fix potential NULL pointer dereference.
Bug:
33179012
Change-Id: I700d535da0e72f5641bf9257a34fdb5d5d068b12
Dan Willemsen [Thu, 15 Dec 2016 20:31:22 +0000 (20:31 +0000)]
Merge "Fix unused-parameter warnings"
am:
f7f08afc8b
Change-Id: I9edd4a3f3dc7b68730e15fc38ed05218150869c5
Dan Willemsen [Thu, 15 Dec 2016 20:31:04 +0000 (20:31 +0000)]
Merge "Fix CameraParameters2::OrderedKeyedVector::removeItem tautological-compare"
am:
2142e027a4
Change-Id: Ia1598e7f76d26e62bd23f700fc351bb6693bf669
Treehugger Robot [Thu, 15 Dec 2016 20:24:16 +0000 (20:24 +0000)]
Merge "Fix unused-parameter warnings"
Treehugger Robot [Thu, 15 Dec 2016 20:18:34 +0000 (20:18 +0000)]
Merge "Fix CameraParameters2::OrderedKeyedVector::removeItem tautological-compare"
Dan Willemsen [Thu, 15 Dec 2016 20:11:21 +0000 (20:11 +0000)]
Merge "Fix mismatched-tags error"
am:
604224ed40
Change-Id: If4e438ff18fd6035f26f5a2214f6b1f4a0fa2fb6
Treehugger Robot [Thu, 15 Dec 2016 20:05:26 +0000 (20:05 +0000)]
Merge "Fix mismatched-tags error"
Dan Willemsen [Wed, 14 Dec 2016 04:34:11 +0000 (20:34 -0800)]
Fix unused-parameter warnings
These are exposed when frameworks/av/include is moved from being a
system include directory to a normal include directory.
Test: m -j checkbuild
Change-Id: I0e3787fbee70339f7dcbc979f448800ecfff0f17
Merged-In: I0e3787fbee70339f7dcbc979f448800ecfff0f17
Dan Willemsen [Wed, 14 Dec 2016 04:32:25 +0000 (20:32 -0800)]
Fix mismatched-tags error
These are exposed when frameworks/av/include is moved from being a
system include directory to a normal include directory.
Test: m -j checkbuild
Change-Id: Iaa8f3808d578ebedc75e863b9818cfbbec9080b2
Merged-In: Iaa8f3808d578ebedc75e863b9818cfbbec9080b2
Dan Willemsen [Wed, 14 Dec 2016 05:57:26 +0000 (21:57 -0800)]
Fix CameraParameters2::OrderedKeyedVector::removeItem tautological-compare
The tautological-compare warning/error is uncovered when
frameworks/av/include is moved from being a system header directory to a
normal include directory.
Test: m -j checkbuild
Change-Id: Ie2d6c354f11e162416a1ac5e8ea185fa62a959a0