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

16978 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Elliott Hughes
3ab8b859c2 Fix missing <stdarg.h>. 
system/core/fastboot/engine.cpp:84:5: error: use of undeclared identifier 'va_start'

Change-Id: I8aff9a40d33f403c0d0d91a15638863fe24dca2e
 2015-08-25 19:34:13 -07:00
Elliott Hughes
f46036732f am 04b94b25: Merge "Use 64-bit file sizes in fastboot." 
* commit '04b94b2571a0f90b55140f2d2748f2876fdfa408':
  Use 64-bit file sizes in fastboot.
 2015-08-26 02:19:31 +00:00
Elliott Hughes
04b94b2571 Merge "Use 64-bit file sizes in fastboot." 2015-08-26 02:12:50 +00:00
Elliott Hughes
fc79767fc2 Use 64-bit file sizes in fastboot. 
Bug: 20110580
Change-Id: I5d3718103ff581ff3b5241c8b0e52b585b4f37e5
 2015-08-25 19:11:52 -07:00
Elliott Hughes
615af25ffd am a421c1e5: Merge "Possible Mac build fix." 
* commit 'a421c1e5bc32ef29bdfa8d065f27b7ea950f12a2':
  Possible Mac build fix.
 2015-08-26 01:01:18 +00:00
Elliott Hughes
a421c1e5bc Merge "Possible Mac build fix." 2015-08-26 00:54:10 +00:00
Elliott Hughes
62077d32a2 Possible Mac build fix. 
The error was this:

  system/core/adb/usb_osx.cpp:203:74: error: values of type 'UInt32' should not
  be used as format arguments; add an explicit cast to 'unsigned int' instead
  [-Werror,-Wformat]
    snprintf(devpathBuf, sizeof(devpathBuf), "usb:%" PRIu32 "X", locationId);
                                                  ~~~            ^~~~~~~~~~
                                                                 (unsigned int)

Which seems to be because on LP64 UInt32 is "unsigned int" but on LP32 it was
"unsigned long". We don't have to care about LP32, so -- if we can -- we're
probably better off just using uint32_t instead of UInt32.

Change-Id: I576f76cf2016ee59caccbc317ef74b6e8d71d722
 2015-08-25 17:48:12 -07:00
Elliott Hughes
9492db23b9 am 62643302: Merge "Not all filesystems support setting SELinux labels." 
* commit '626433024df69520b0b45da563b8afce750b25c6':
  Not all filesystems support setting SELinux labels.
 2015-08-26 00:22:00 +00:00
Elliott Hughes
626433024d Merge "Not all filesystems support setting SELinux labels." 2015-08-26 00:18:44 +00:00
Sergio Giro
457132b436 am e1140e00: am 09a474ac: am ba4e6a80: (-s ours) am bd7dd79e: am 25592fbe: am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer 
* commit 'e1140e00a9b922bb88d8df2b58c3d5b2b92bc80a':
  [DO NOT MERGE] libutils: fix overflow in SharedBuffer
 2015-08-26 00:14:49 +00:00
Ruchi Kandoi
62729a1d19 am 565e4c6a: Merge "healthd: Adds cycle_count, current_now and full_charge properties." 
* commit '565e4c6a43c0d05c1a4fea03cdb47c04b6eea10b':
  healthd: Adds cycle_count, current_now and full_charge properties.
 2015-08-25 23:53:36 +00:00
Ruchi Kandoi
565e4c6a43 Merge "healthd: Adds cycle_count, current_now and full_charge properties." 2015-08-25 23:45:42 +00:00
Sergio Giro
e1140e00a9 am 09a474ac: am ba4e6a80: (-s ours) am bd7dd79e: am 25592fbe: am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer 
* commit '09a474ac72f9663212d090b3f7d5f03d96171c6d':
  [DO NOT MERGE] libutils: fix overflow in SharedBuffer
 2015-08-25 23:45:10 +00:00
Sergio Giro
09a474ac72 am ba4e6a80: (-s ours) am bd7dd79e: am 25592fbe: am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer 
* commit 'ba4e6a804d2ac4577daa2f2db68857e1b01ce3bf':
  [DO NOT MERGE] libutils: fix overflow in SharedBuffer
 2015-08-25 23:35:30 +00:00
Elliott Hughes
383444085a Not all filesystems support setting SELinux labels. 
Bug: http://b/23530370
Change-Id: Ie4deb3544304754696f049d17b12168cad4a51fd
 2015-08-25 16:33:50 -07:00
Sergio Giro
ba4e6a804d am bd7dd79e: am 25592fbe: am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer 
* commit 'bd7dd79e8ce8edcba61249b4d263d20ed98c4c92':
  [DO NOT MERGE] libutils: fix overflow in SharedBuffer
 2015-08-25 23:25:12 +00:00
Steve Fung
c734ac274a am c3d61786: Merge "crash_reporter: Run with supplemental groups" 
* commit 'c3d61786f088f0887f1dd5ad0498aa927148b0f0':
  crash_reporter: Run with supplemental groups
 2015-08-25 23:03:55 +00:00