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

16812 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andres Morales
c1bdcf56c0 am c7a8f67e: (-s ours) am 0b0435ea: [gatekeeperd] fix file descriptor leak 
* commit 'c7a8f67e425d286a9eba4a9716ea2590b8752f90':
 2015-08-27 11:38:16 +00:00
Christopher Ferris
9dcbe6b13f am a28c0810: (-s ours) am c03e40fb: am a3ee46f1: Merge "Dump memory going from unreadable to readable." 
* commit 'a28c0810d3ba0664974d533d00a907107eb9be07':
 2015-08-27 11:37:58 +00:00
Pirama Arumuga Nainar
5806ab6125 am 2aee3fd8: (-s ours) am 85074538: am 8cd62808: Merge "Use delete[] to de-allocate pointers from new[]" 
* commit '2aee3fd843138b22f34dc7249c2a2c13a4a49550':
 2015-08-27 11:37:48 +00:00
Dan Albert
881f853345 am fcbc32de: (-s ours) am 00599eca: am e84205bf: Merge "Revert "Turn on -Wformat-nonliteral."" 
* commit 'fcbc32de34ceea570824b98f243d40a228df1989':
 2015-08-27 11:37:29 +00:00
Dan Albert
a7d9920f42 am f9b81ccd: (-s ours) am fcdc3141: am a35affb5: Merge "Turn on -Wformat-nonliteral." 
* commit 'f9b81ccd7560deeade1f8bfc3fedbd5a1b460986':
 2015-08-27 11:37:22 +00:00
Elliott Hughes
aab10418a3 am d15baf01: (-s ours) am 9d748c8b: am a6241a02: Merge "Replace HAVE_WIN32_IPC with _WIN32." 
* commit 'd15baf01806834699285e6b788a2963c1062084e':
 2015-08-27 11:37:16 +00:00
Christopher Ferris
d02344c940 am 70c1fb87: (-s ours) am 0473a1ea: am b6deb331: Merge "New property that determines when to wait for gdb." 
* commit '70c1fb87e81bbdd389cdb42790469cb1bd7b7ff1':
 2015-08-27 11:37:10 +00:00
Daniel Rosenberg
9c079c94d7 am a5b671d0: (-s ours) am 32933ff5: am dc4fa7f6: Merge "Fix "adb remount" for when the root directory is in system.img" 
* commit 'a5b671d0e38d171105b4c76f5671c2c62549d831':
 2015-08-27 11:37:06 +00:00
Christopher Ferris
6f954b7ae2 am 36fa4226: (-s ours) am 708e5438: am 41a0654e: Merge "Replace all _LOG error calls with ALOGE." 
* commit '36fa42262d4642eb1bb55b39f68ae17a39a1698a':
 2015-08-27 11:37:00 +00:00
Elliott Hughes
90ac2c7356 am fd41558c: (-s ours) am dba00aab: am c9aeae27: Merge "Fix debuggerd\'s gdbclient instructions." 
* commit 'fd41558c66553ca85229e1a5f06196d9cf6b52e5':
 2015-08-27 11:36:54 +00:00
Paul Lawrence
1695f544d1 am c011b031: (-s ours) am 81046166: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev 
* commit 'c011b031c988038f81c72875fdd6ac7349774f35':
 2015-08-27 11:36:49 +00:00
Andres Morales
b466dc1790 am 775b58d0: (-s ours) am 833f142d: Merge "[init] start gatekeeperd after device decryption" into mnc-dev 
* commit '775b58d08f207cc1752deca50e4526f19ac14583':
 2015-08-27 11:36:45 +00:00
Mark Salyzyn
6c4090f215 am f92c19ee: (-s ours) am 6b6c1bd9: Gracefully handle ENODEV in sdcard daemon (part deux) 
* commit 'f92c19ee33006aff0f541e9142801648dccd6fd3':
 2015-08-27 11:36:41 +00:00
Paul Lawrence
4604d55992 am d3669ff2: (-s ours) am a65e402b: Merge "Change init sequence to support file level encryption" into mnc-dev 
* commit 'd3669ff27f782ce1da324f0a6043204a3a4e9f3f':
 2015-08-27 11:36:36 +00:00
Elliott Hughes
15b8b8ad80 am 0c3cb52d: (-s ours) am f4bb11d2: am 913ef1ca: Merge "Fixed a documentation error in protocol.txt" 
* commit '0c3cb52dfc358cd6d6e01062e7cff50fb98e93d0':
 2015-08-27 11:36:32 +00:00
Jeff Sharkey
ab34ed894b am d67d339d: (-s ours) am 25aabb9e: Permission to view shared storage for all users. 
* commit 'd67d339dab90690949b9344490310e7ded448cb0':
 2015-08-27 11:36:27 +00:00
Bart Sears
7465c368f3 am 8bc53c12: am d239dbb2: am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev 
* commit '8bc53c125ab739db7bd34bd3b5c496c3f3a542f9':
  libutils: fix overflow in SharedBuffer [DO NOT MERGE]
 2015-08-27 04:53:23 +00:00
Bart Sears
8bc53c125a am d239dbb2: am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev 
* commit 'd239dbb2578ca70cb4cd44b78a0295bdd8af0e36':
  libutils: fix overflow in SharedBuffer [DO NOT MERGE]
 2015-08-27 01:37:47 +00:00
Bart Sears
d239dbb257 am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev 
* commit '170bde83ae90e03b7964edf2a00da6f83c406910':
  libutils: fix overflow in SharedBuffer [DO NOT MERGE]
 2015-08-27 01:27:29 +00:00
Abhishek Arya
de19de0ce5 am 15361abe: am 5b33306d: Merge "libutils: fix overflow in SharedBuffer [DO NOT MERGE]" into mnc-dev 
* commit '15361abe395a89c725fb99dfdec036283c5df8bf':
  libutils: fix overflow in SharedBuffer [DO NOT MERGE]
 2015-08-26 20:32:07 +00:00
Abhishek Arya
15361abe39 am 5b33306d: Merge "libutils: fix overflow in SharedBuffer [DO NOT MERGE]" into mnc-dev 
* commit '5b33306dba456ec906f7c9bd522681c1de137f78':
  libutils: fix overflow in SharedBuffer [DO NOT MERGE]
 2015-08-26 20:11:09 +00:00
Abhishek Arya
5b33306dba Merge "libutils: fix overflow in SharedBuffer [DO NOT MERGE]" into mnc-dev 2015-08-26 20:06:19 +00:00
Bart Sears
170bde83ae resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev 
Change-Id: I236367bd60046ba06669cbcdae81184f9d0a74c7
 2015-08-26 12:59:28 -07:00
Yabin Cui
bc4942284d am f03aa667: am fbdd5ee2: Merge "adb: keep all asocket operations in the main thread." 
* commit 'f03aa6670e39ef1a46211960d134b2528a3649f5':
  adb: keep all asocket operations in the main thread.
 2015-08-26 19:59:02 +00:00
Yabin Cui
f03aa6670e am fbdd5ee2: Merge "adb: keep all asocket operations in the main thread." 
* commit 'fbdd5ee2f6d35f8fde53c37e0ef83765aa7f5981':
  adb: keep all asocket operations in the main thread.
 2015-08-26 19:46:37 +00:00
Yabin Cui
fbdd5ee2f6 Merge "adb: keep all asocket operations in the main thread." 2015-08-26 19:40:54 +00:00
Nick Kralevich
26dbd63052 am 63141512: am 53f11b62: Merge "libcutils: enable LOCAL_SANITIZE := integer" 
* commit '631415129c51a24cd5c9843694bd5283fe3b9345':
  libcutils: enable LOCAL_SANITIZE := integer
 2015-08-26 18:51:17 +00:00
Nick Kralevich
4abea965ce am 38f4a139: am 532e6cde: Merge "libcutils: cleanups for -fsanitize=integer" 
* commit '38f4a1391e499c2392cd8136061153cc35438eb3':
  libcutils: cleanups for -fsanitize=integer
 2015-08-26 18:51:15 +00:00
Nick Kralevich
631415129c am 53f11b62: Merge "libcutils: enable LOCAL_SANITIZE := integer" 
* commit '53f11b620d2be294d3f04acd801e6a5c2f2f4a69':
  libcutils: enable LOCAL_SANITIZE := integer
 2015-08-26 18:41:11 +00:00
Nick Kralevich
38f4a1391e am 532e6cde: Merge "libcutils: cleanups for -fsanitize=integer" 
* commit '532e6cde993d7c6d2b93689da9626c33295b4ac8':
  libcutils: cleanups for -fsanitize=integer
 2015-08-26 18:41:09 +00:00
Nick Kralevich
53f11b620d Merge "libcutils: enable LOCAL_SANITIZE := integer" 2015-08-26 18:35:11 +00:00
Nick Kralevich
fc82dd9179 libcutils: enable LOCAL_SANITIZE := integer 
Call abort() on undefined or sketchy integer behavior.
Protects against integer overflow attacks.

Tested on Nexus 5 and Nexus 9 with no obvious problems.

Change-Id: I6cb28b4a0f5feed69ea472dfac8804fb0bf99719
 2015-08-26 11:32:31 -07:00
Nick Kralevich
532e6cde99 Merge "libcutils: cleanups for -fsanitize=integer" 2015-08-26 18:30:59 +00:00
Yabin Cui
34f45c5663 adb: keep all asocket operations in the main thread. 
As far as I can see, all asockets operations happen in fdevent_loop()
in the main thread, excepting close_all_sockets(). Instead of adding
lock and ref_count for each asocket, a simpler way would be moving
close_all_sockets() from input_thread to the main thread.

In input_thread(), there are two path to break the loop and call
close_all_sockets(). One path is when receiving offline A_SYNC, which
is sent by the main thread. The other path is when read_packet
fails, which I believe is almost not possible and doesn't matter
(Because t->fd is closed just before t is freed.). So I move
close_all_sockets() to handle_offline() in the main thread.

the socket_list_lock in sockets.cpp could be removed. But I prefer
to leave it for the following changes.

Bug: 6558362
Change-Id: I5da23f60a67a331262c62693b9b127fe2689c799
 2015-08-26 11:27:43 -07:00
Mark Salyzyn
851bd8cc24 am 0c3177c5: am 64393789: Merge "logd: worst uid record watermark part deux" 
* commit '0c3177c5b13b0826068f922f26f9b1eacbc0fac0':
  logd: worst uid record watermark part deux
 2015-08-26 18:13:09 +00:00
Mark Salyzyn
0c3177c5b1 am 64393789: Merge "logd: worst uid record watermark part deux" 
* commit '64393789227b303fa142690efe34ab3ffc567475':
  logd: worst uid record watermark part deux
 2015-08-26 17:54:53 +00:00
Mark Salyzyn
6439378922 Merge "logd: worst uid record watermark part deux" 2015-08-26 17:49:53 +00:00
Nick Kralevich
7390478f19 libcutils: cleanups for -fsanitize=integer 
Hash functions rely on overflow behavior, so whitelist them.

ATRACE_TAG_NOT_READY: use an unsigned constant when shifting bits.
Otherwise, the value overflows on shift. The users of this constant
assign it to a uint64_t variable.

Change-Id: I21c437ce2083525e906c3ead3259ec34a1ef4b66
 2015-08-26 10:40:00 -07:00
Elliott Hughes
dda47599d7 am b6ae989a: am 0ac29519: Merge "Don\'t build 32-bit host libadb." 
* commit 'b6ae989acf9958632ce91d2f06fd185aeb9fd0d3':
  Don't build 32-bit host libadb.
 2015-08-26 03:47:48 +00:00
Elliott Hughes
ba2e8fca66 am 5e2e4fd5: am e2cda953: Merge "Fix missing <stdarg.h>." 
* commit '5e2e4fd5c8fa4fd819b7080ad374a2a62b98ad82':
  Fix missing <stdarg.h>.
 2015-08-26 03:47:47 +00:00
Elliott Hughes
6aa68e81e2 am f4603673: am 04b94b25: Merge "Use 64-bit file sizes in fastboot." 
* commit 'f46036732f7ac125bb4698d1d742c6a1299f7259':
  Use 64-bit file sizes in fastboot.
 2015-08-26 03:47:46 +00:00
Elliott Hughes
495c8a0603 am 615af25f: am a421c1e5: Merge "Possible Mac build fix." 
* commit '615af25ffdde99331c173499446e08c3a7ec32a8':
  Possible Mac build fix.
 2015-08-26 03:47:44 +00:00
Elliott Hughes
1c3cc30fdb am 9492db23: am 62643302: Merge "Not all filesystems support setting SELinux labels." 
* commit '9492db23b9feeb589be36fece46e55dc66d7f1dd':
  Not all filesystems support setting SELinux labels.
 2015-08-26 03:47:42 +00:00
Ruchi Kandoi
ef1bb411cb am 62729a1d: am 565e4c6a: Merge "healthd: Adds cycle_count, current_now and full_charge properties." 
* commit '62729a1d195cd27b353da24be21bd0a855884431':
  healthd: Adds cycle_count, current_now and full_charge properties.
 2015-08-26 03:47:33 +00:00
Steve Fung
4a274dcdbf am c734ac27: am c3d61786: Merge "crash_reporter: Run with supplemental groups" 
* commit 'c734ac274aca9c9dbe299d85881a54b333d083cf':
  crash_reporter: Run with supplemental groups
 2015-08-26 02:54:11 +00:00
Elliott Hughes
b6ae989acf am 0ac29519: Merge "Don\'t build 32-bit host libadb." 
* commit '0ac29519ac75a72a4ecacffc819eff9adf5b1b70':
  Don't build 32-bit host libadb.
 2015-08-26 02:44:34 +00:00
Elliott Hughes
5e2e4fd5c8 am e2cda953: Merge "Fix missing <stdarg.h>." 
* commit 'e2cda95341d5468eb9ee5d3552f7de5c572dd132':
  Fix missing <stdarg.h>.
 2015-08-26 02:40:57 +00:00
Elliott Hughes
0ac29519ac Merge "Don't build 32-bit host libadb." 2015-08-26 02:38:51 +00:00
Elliott Hughes
daa6c463a9 Don't build 32-bit host libadb. 
Change-Id: Ib6ad3db2dc160273d20fa14e0820f29ed649d75a
 2015-08-25 19:38:14 -07:00
Elliott Hughes
e2cda95341 Merge "Fix missing <stdarg.h>." 2015-08-26 02:34:52 +00:00