ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
26519 commits 1 branch 0 tags 217 MiB
Commit graph

26519 commits

This branch
This branch
All branches
Author SHA1 Message Date
Colin Cross
7df39fbdf4 Merge "Fix warnings in system/ headers" am: d7f60fd871 am: 299df0bf01 am: 88fd7e2ec4 
am: bd45ba6972

Change-Id: I3f643d2586ca0fa2eec0411f5995eca74308775c
 2016-09-23 01:09:54 +00:00
Josh Gao
5528530939 Merge "adb: kill adb_mutex_t, adb_cond_t." am: 7e4d1db957 am: 72c679d6d0 am: 71970fc473 
am: 6d317aca93

Change-Id: I32dd75cad6ead4243436771cc40ee3224c0d4d7b
 2016-09-23 01:09:41 +00:00
Ajay Panicker
ac657cd0d2 Merge "Remove net_bt_stack group and replace it with bluetooth" am: 7875407bb7 am: f924c252bd am: b0db9714bb 
am: 531b201eb6

Change-Id: Ie822dd8f259f240eb457f5d67948c417f84817c6
 2016-09-23 00:04:45 +00:00
Colin Cross
bd45ba6972 Merge "Fix warnings in system/ headers" am: d7f60fd871 am: 299df0bf01 
am: 88fd7e2ec4

Change-Id: I94891ea3c3a00ee39b48531fcc8e5e3d6ebe724a
 2016-09-22 22:52:44 +00:00
Josh Gao
6d317aca93 Merge "adb: kill adb_mutex_t, adb_cond_t." am: 7e4d1db957 am: 72c679d6d0 
am: 71970fc473

Change-Id: I77f0221da27abb337ce7d8896cd6ad94c04548cf
 2016-09-22 22:52:16 +00:00
Tianjie Xu
13cc6357a2 Merge "Fix out of bound access in libziparchive" 2016-09-22 22:12:05 +00:00
Ajay Panicker
531b201eb6 Merge "Remove net_bt_stack group and replace it with bluetooth" am: 7875407bb7 am: f924c252bd 
am: b0db9714bb

Change-Id: I025c5301fecf0566d8184efce099a195fdbfc460
 2016-09-22 21:58:27 +00:00
Tianjie Xu
ae8180c06d Fix out of bound access in libziparchive 
The boundary check of an invalid EOCD record may succeed due to the
overflow of uint32_t. Fix the check and add a unit test.

Test: Open the crash.apk and libziparchive reports the offset error as expected.

Bug: 31251826
Change-Id: I1d8092a19b73886a671bc9d291cfc27d65e3d236
 2016-09-22 11:24:42 -07:00
Colin Cross
88fd7e2ec4 Merge "Fix warnings in system/ headers" am: d7f60fd871 
am: 299df0bf01

Change-Id: Ie6b83fdc3b97601e1021b104d4b42eec6b30bfc4
 2016-09-22 11:54:20 +00:00
Josh Gao
71970fc473 Merge "adb: kill adb_mutex_t, adb_cond_t." am: 7e4d1db957 
am: 72c679d6d0

Change-Id: I3b726d03c8dc299191a68488e28fe83c3bd89a77
 2016-09-22 11:54:05 +00:00
Ajay Panicker
b0db9714bb Merge "Remove net_bt_stack group and replace it with bluetooth" am: 7875407bb7 
am: f924c252bd

Change-Id: I99e0ed5e52c71b2e41e54faf03678e57a853d140
 2016-09-22 11:23:53 +00:00
Colin Cross
cde7766832 Merge "Hide warning in cutils/trace.h" am: 5cf3db6d2b am: a802e570b3 am: 06ec4b1352 
am: 7673c4dc88

Change-Id: I556b9a6800480cc4cd9b1f5cc702d0ae460dd95e
 2016-09-22 09:26:11 +00:00
Colin Cross
ac9e186da2 Merge "Hide gnu extension warnings in log/log.h" am: 21049e5c91 am: 9eb3592e62 am: 4df8e4580b 
am: e84c07c832

Change-Id: I333d7b0e9cd4f56087ccf20ab732024d238ad68f
 2016-09-22 09:26:00 +00:00
Colin Cross
7673c4dc88 Merge "Hide warning in cutils/trace.h" am: 5cf3db6d2b am: a802e570b3 
am: 06ec4b1352

Change-Id: If41d5b551ffe237922f4768cf403cadf7ee15887
 2016-09-22 09:15:21 +00:00
Colin Cross
e84c07c832 Merge "Hide gnu extension warnings in log/log.h" am: 21049e5c91 am: 9eb3592e62 
am: 4df8e4580b

Change-Id: I18d466cf45327b96856e2fb2c0ec7954a675987a
 2016-09-22 09:15:06 +00:00
Colin Cross
299df0bf01 Merge "Fix warnings in system/ headers" 
am: d7f60fd871

Change-Id: I616548e002f517fe9f85b49aef9d9b6a5548127e
 2016-09-22 08:21:43 +00:00
Josh Gao
72c679d6d0 Merge "adb: kill adb_mutex_t, adb_cond_t." 
am: 7e4d1db957

Change-Id: I3e10b6e3039e3aeb966f8ca27df69b61fa8aa0cc
 2016-09-22 08:21:30 +00:00
Josh Gao
847895809c Merge "adb: parse tcp socket specs with base::ParseNetAddress." am: efee71c2de am: 67ed583564 am: 837f2cef9a 
am: 88e36027ed

Change-Id: I0765f200900323ba9794cf2f57c4e2a2f000c320
 2016-09-22 08:12:27 +00:00
Ajay Panicker
f924c252bd Merge "Remove net_bt_stack group and replace it with bluetooth" 
am: 7875407bb7

Change-Id: Idd864e20abbe5d9394c63e92ab8a8ac2b020c2e7
 2016-09-22 08:09:39 +00:00
Treehugger Robot
d7f60fd871 Merge "Fix warnings in system/ headers" 2016-09-22 02:46:51 +00:00
Treehugger Robot
7e4d1db957 Merge "adb: kill adb_mutex_t, adb_cond_t." 2016-09-22 02:15:00 +00:00
Ajay Panicker
7875407bb7 Merge "Remove net_bt_stack group and replace it with bluetooth" 2016-09-22 01:32:34 +00:00
Colin Cross
06ec4b1352 Merge "Hide warning in cutils/trace.h" am: 5cf3db6d2b 
am: a802e570b3

Change-Id: I216420b21d71087b2e3a5bc864f9d419270dc749
 2016-09-22 01:02:40 +00:00
Colin Cross
4df8e4580b Merge "Hide gnu extension warnings in log/log.h" am: 21049e5c91 
am: 9eb3592e62

Change-Id: I3c155d9b0ca9f5e87e35159e578fbe91af0ed4ec
 2016-09-22 01:02:27 +00:00
Colin Cross
a802e570b3 Merge "Hide warning in cutils/trace.h" 
am: 5cf3db6d2b

Change-Id: Ie32731764880823560d79aa6cbcc17faf5cd5bf8
 2016-09-22 00:55:11 +00:00
Colin Cross
9eb3592e62 Merge "Hide gnu extension warnings in log/log.h" 
am: 21049e5c91

Change-Id: Ie25019ffacd234d06e46d40547858009d8341fa3
 2016-09-22 00:54:58 +00:00
Colin Cross
7c7990e6fd Fix warnings in system/ headers 
system/core/include is included in the global include path using
-isystem, which hides all warnings.  Fix warnings in
system/core/include/system in preparation for moving from -isystem to -I.

- Fix invalid doxygen syntax in graphics.h
- Use a pragma to hide a C99 extension warning on the flexible length
  array in graphics.h
- Make static functions in radio.h static inline
- Fix size_t printf and size_t vs. ssize_t comparision in qemu_pipe.h
- Fix old style cast in window.h

Test: m -j native
Bug: 31492149
Change-Id: I857f289e4c8e303494831873282bbb69de155c10
 2016-09-21 17:46:59 -07:00
Colin Cross
5cf3db6d2b Merge "Hide warning in cutils/trace.h" 2016-09-22 00:46:13 +00:00
Colin Cross
9993e799f1 Hide warning in cutils/trace.h 
system/core/include is included in the global include path using
-isystem, which hides all warnings.  cutils/trace.h has an ignored
return value warning, move the implementation to trace-dev.c so it
doesn't cause warnings in every module that includes it in preparation
for moving from -isystem to -I.

Test: m -j native
Bug: 31492149
Change-Id: If8b3fe13059c9e59c2d5208294d427d84fa6e588
 2016-09-21 17:45:31 -07:00
Colin Cross
21049e5c91 Merge "Hide gnu extension warnings in log/log.h" 2016-09-22 00:45:02 +00:00
Josh Gao
0cd3ae1c28 adb: kill adb_mutex_t, adb_cond_t. 
Now that we have support for std::mutex and std::condition_variable on
Windows, remove our mutex compatibility layer in favor of the C++ one.

Bug: http://b/31653591
Test: mma && $ANDROID_HOST_OUT/nativetest64/adb_test/adb_test && \
      python test_adb.py && python test_device.py
      (also on Windows)

Change-Id: I5b7ed9c45cc2a32edcf4e77b56dc28e441f15f34
 2016-09-21 17:22:22 -07:00
Josh Gao
88e36027ed Merge "adb: parse tcp socket specs with base::ParseNetAddress." am: efee71c2de am: 67ed583564 
am: 837f2cef9a

Change-Id: I4d7da8197397c2ab84f46733eeb3cd0eba82a01f
 2016-09-21 20:38:59 +00:00
Josh Gao
837f2cef9a Merge "adb: parse tcp socket specs with base::ParseNetAddress." am: efee71c2de 
am: 67ed583564

Change-Id: Ia820151b0c5fae600adb204421759b9cc5c92ad7
 2016-09-21 20:31:28 +00:00
Josh Gao
67ed583564 Merge "adb: parse tcp socket specs with base::ParseNetAddress." 
am: efee71c2de

Change-Id: I911b1bed18e1d1d55c585d78479a85d4d8ba2875
 2016-09-21 20:28:57 +00:00
Josh Gao
efee71c2de Merge "adb: parse tcp socket specs with base::ParseNetAddress." 2016-09-21 20:26:36 +00:00
Philip P. Moltmann
7c9800dfe6 Merge "usb-bulk-transfer: Clarify sign-iy-ness of param" am: b721c97ec9 am: 775a97fa18 am: 6d83246d40 
am: f4e1e0ff3d

Change-Id: Ifa9603f1e667fde9c1f1920f9b5515bcd6051341
 2016-09-21 18:59:57 +00:00
Narayan Kamath
629494b390 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b am: 3a53e2ce04 am: 2bbafc1f7d am: 6202d11086 am: 320a603b32 am: cbd82ed9e7 
am: d5309cc3f7

Change-Id: Idd4e06e12f50ad6a437e4475864df25206eeacf9
 2016-09-21 18:59:45 +00:00
Narayan Kamath
3f655c39d6 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b am: 3a53e2ce04 am: 2bbafc1f7d am: c3f3fdfc7d 
am: e2032632f4

Change-Id: Id24ea4fd770b84ddda182e10107bedac6e214f1d
 2016-09-21 18:59:29 +00:00
Philip P. Moltmann
f4e1e0ff3d Merge "usb-bulk-transfer: Clarify sign-iy-ness of param" am: b721c97ec9 am: 775a97fa18 
am: 6d83246d40

Change-Id: I51be73325f922a3fe2386ae1e02d387ed7ad4836
 2016-09-21 18:39:36 +00:00
Philip P. Moltmann
6d83246d40 Merge "usb-bulk-transfer: Clarify sign-iy-ness of param" am: b721c97ec9 
am: 775a97fa18

Change-Id: I70c38b32f6ccf66965e9ac9d10f1dcff7f011c9a
 2016-09-21 18:37:05 +00:00
Philip P. Moltmann
775a97fa18 Merge "usb-bulk-transfer: Clarify sign-iy-ness of param" 
am: b721c97ec9

Change-Id: I03ab47bbea13d9e01272746560291ea133845804
 2016-09-21 18:34:35 +00:00
Philip P. Moltmann
b721c97ec9 Merge "usb-bulk-transfer: Clarify sign-iy-ness of param" 2016-09-21 18:30:58 +00:00
Narayan Kamath
d5309cc3f7 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b am: 3a53e2ce04 am: 2bbafc1f7d am: 6202d11086 am: 320a603b32 
am: cbd82ed9e7

Change-Id: I3da73dab66ef3b61e0560a6423092746f65a5fc4
 2016-09-21 18:04:55 +00:00
Narayan Kamath
e2032632f4 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b am: 3a53e2ce04 am: 2bbafc1f7d 
am: c3f3fdfc7d

Change-Id: Ie44efd1f220a50404143c002323db2cd5c06a5f6
 2016-09-21 18:04:29 +00:00
Narayan Kamath
cbd82ed9e7 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b am: 3a53e2ce04 am: 2bbafc1f7d am: 6202d11086 
am: 320a603b32

Change-Id: Ic10ed8262eec16649acbeff9e265a3ca9bfdba07
 2016-09-21 18:02:22 +00:00
Narayan Kamath
320a603b32 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b am: 3a53e2ce04 am: 2bbafc1f7d 
am: 6202d11086

Change-Id: I92912bf57752fa5e5f3b252b1e7b9270700002ee
 2016-09-21 17:59:52 +00:00
Narayan Kamath
c3f3fdfc7d resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b am: 3a53e2ce04 
am: 2bbafc1f7d

Change-Id: I9d2ff7778285a19b1c0a7ac339c05a301bf28f95
 2016-09-21 17:59:28 +00:00
Narayan Kamath
6202d11086 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b am: 3a53e2ce04 
am: 2bbafc1f7d

Change-Id: I287df6237259d23fede2752175faded26ca158f4
 2016-09-21 17:56:58 +00:00
Narayan Kamath
2bbafc1f7d resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b 
am: 3a53e2ce04

Change-Id: I2bc67485c0f92960b0124067a3e9e1cd8438e712
 2016-09-21 17:54:29 +00:00
Narayan Kamath
3a53e2ce04 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 
am: b8f35dd70b

Change-Id: I9761ac7ba5f26a1e581fa1446e6e4b36753cf424
 2016-09-21 17:51:26 +00:00