Commit Graph

23996 Commits

Author SHA1 Message Date
Treehugger Robot 67855d8454 Merge changes I0a00b3d4,I19cb0694
* changes:
  adb: let `adb push` follow symlinks.
  base: add parameter that controls O_NOFOLLOW in file functions.
2016-09-15 02:19:14 +00:00
Josh Gao 94dc19ff57 adb: let `adb push` follow symlinks.
Bug: http://b/31491920
Test: touch foo; ln -s foo bar; adb push bar /data/local/tmp
Test: python test_device.py
Change-Id: I0a00b3d49fdf7206e27d66ac110b56e22449a1ad
2016-09-14 17:08:22 -07:00
Josh Gao ffabc9651f base: add parameter that controls O_NOFOLLOW in file functions.
Bug: http://b/31491920
Change-Id: I19cb06941d87c0180ccab8bb2d85e57338811624
Test: m
2016-09-14 17:08:22 -07:00
Josh Gao 1a73e9b7e2 Merge "Fix darwin build break." 2016-09-14 21:02:01 +00:00
Josh Gao c95afaa20b Fix darwin build break.
Bug: http://b/31468413
Change-Id: I12fdf0977213eefc7043939964070025a672881a
2016-09-14 13:54:45 -07:00
Treehugger Robot c9c555b8dd Merge changes Ie15fcb8f,I0a895911
* changes:
  base: add quick_exit emulation.
  base: extract mutex.h from logging.cpp.
2016-09-14 20:14:53 +00:00
Josh Gao 0c44256ae4 base: add quick_exit emulation.
Bug: http://b/31468413
Change-Id: Ie15fcb8ff0613d01a0eb7437a2cb37283aa52bab
Test: mma, libbase_test on Linux/Windows
2016-09-13 17:54:50 -07:00
Treehugger Robot ad81a1d94a Merge "Base: Fix dangling-else in CHECK_STROP" 2016-09-13 23:09:37 +00:00
Josh Gao 63bdcb57aa base: extract mutex.h from logging.cpp.
Extract the Windows-specific mutex implementation from logging.cpp.

Bug: http://b/31468413
Change-Id: I0a895911ec6d815b8011b09d55209b64bbf9a70e
Test: mma
2016-09-13 15:59:46 -07:00
Andreas Gampe d8f26e2ac9 Base: Fix dangling-else in CHECK_STROP
Follow-up to commit 2527628eda.

Bug: 26962895
Bug: 31338270
Test: m
Test: mmma system/core/base && $ANDROID_HOST_OUT/nativetest64/libbase_test/libbase_test64
Change-Id: Ifd71314e146ebf3957cc053ee95ef85002c909b4
2016-09-13 14:16:37 -07:00
Treehugger Robot de029a894a Merge "Fix zygote energy-aware scheduler tuning bug" 2016-09-13 19:04:38 +00:00
Bill Yi 07572a92b9 Merge "Remove crash_reporter and metricsd" 2016-09-12 16:19:49 +00:00
Treehugger Robot 2713c88a62 Merge "Remove deprecated libnetutils DHCPv4 code" 2016-09-12 04:04:10 +00:00
Erik Kline d72ba4489c Remove deprecated libnetutils DHCPv4 code
Change-Id: I9777730fee0f5c1877b246aa65b03e82d6f475a5
2016-09-10 09:14:51 +09:00
Christopher Wiley 2728ff249c Remove crash_reporter and metricsd
The responsible team has split these out into their own repositories.

Bug: 31397631
Test: checkbuilds pass
Change-Id: Id38e856d533899519bd5e5f20ffa6d79e8de4bff
2016-09-09 15:20:49 -07:00
Dan Stoza f246ec6ae0 Merge changes I9ab41b56,I61e4ca9b
* changes:
  Add color mode enums
  add android_flex_layout for describing all flexible formats.
2016-09-09 18:36:36 +00:00
Treehugger Robot 318cc3c03a Merge "Base: Add AbortFunction for logging" 2016-09-09 00:46:20 +00:00
Andreas Gampe 2691e335fe Base: Add AbortFunction for logging
Add a hook to modify FATAL behavior. Add a test.

Bug: 31338270
Test: m
Test: mmma system/core/base && $ANDROID_HOST_OUT/nativetest64/libbase_test/libbase_test64
Change-Id: I966da319cda613738b3f2ccdac8c21900d6a5c72
2016-09-08 15:33:27 -07:00
Courtney Goeltzenleuchter a2e874eabc Add color mode enums
The android_color_mode_t defines the color modes supported
by a display. A display can support multiple different
color modes.

sRGB mode and AdobeRGB are deliberately placed at 7 and 8
so that they match mode ID's used on prior devices.

bug: http://b/27926012
Change-Id: I9ab41b56ec0b495c02539665da5be158ffddf843
2016-09-08 11:39:32 -07:00
Lajos Molnar 0e10df4dd6 add android_flex_layout for describing all flexible formats.
Bug: 22767098
Bug: 24759202
Change-Id: I61e4ca9bd71e8da88a9571ec4effc7165026715b
2016-09-08 11:38:53 -07:00
TuHailong d90a55c4bf Fix zygote energy-aware scheduler tuning bug
Change-Id: Ib612e99f7b115c2fbd1503e0994948fd0b0a2dec
2016-09-08 21:45:41 +08:00
Treehugger Robot 88b5af68bd Merge "Base: Add INTERNAL_FATAL to logging severity" 2016-09-08 03:25:20 +00:00
Andreas Gampe 550829d84b Base: Add INTERNAL_FATAL to logging severity
Add the INTERNAL_FATAL level. It will print 'F' like FATAL, but
does not abort after logging.

Add a test to logging_test.

Bug: 31338270
Test: m
Test: mmma system/core/base && adb sync && adb shell /data/nativetest/libbase_test/libbase_test32
Change-Id: Idf74c08e8516881efccaefc58fa3f41d57e56396
2016-09-07 18:19:42 -07:00
Treehugger Robot af6a185fb4 Merge "Clean up the libbase logging test." 2016-09-08 00:58:00 +00:00
Elliott Hughes 13d78e440a Clean up the libbase logging test.
Use ECMAscript regex syntax (the default!) for a simpler regex.

Also test the cartesian product of logging options, with less copy & paste
than the previous test of a subset.

Change-Id: I7aae91d276dbbb8de6173d18b5c1ceb01c1dff73
2016-09-07 16:22:40 -07:00
Treehugger Robot 44d7a87621 Merge "Teach debuggerd about SIGSYS SYS_SECCOMP signals." 2016-09-07 22:28:10 +00:00
Christopher Wiley 023b657b0b Merge "Tag hostapd binary with CAP_NET_ADMIN | CAP_NET_RAW" 2016-09-07 22:16:17 +00:00
Elliott Hughes 6fff551728 Teach debuggerd about SIGSYS SYS_SECCOMP signals.
These should be easier to interpret.

Bug: http://b/31171101
Change-Id: I362361d218390ab2306f86976172f8365b26b6ef
2016-09-07 13:55:50 -07:00
Christopher Wiley 6f8e12e6fc Tag hostapd binary with CAP_NET_ADMIN | CAP_NET_RAW
Bug: 30041118
Change-Id: I14d1fd601fc4bce12c563a2004e91bd8ba0f42c3
Test: hostapd can start as the wifi user with these capabilities.
(cherry picked from commit 2502490178)
(cherry picked from commit a76088362e)
2016-09-07 13:30:23 -07:00
Treehugger Robot 3b80e5bc9f Merge "Base: Fix logging_test" 2016-09-07 20:06:29 +00:00
Andreas Gampe 7c1cdd7700 Base: Fix logging_test
Update the expected logging pattern.

Bug: 31338270
Test: mmma system/core/base && adb sync && adb shell /data/nativetest/libbase_test/libbase_test32
Change-Id: I299620669126bc0258cad6e30d5b40bff5ea92ad
2016-09-07 11:39:59 -07:00
Wei Wang f74553f852 Merge "Split fstab mount into 2 phases" 2016-09-06 20:05:57 +00:00
Wei Wang 254f44363b Split fstab mount into 2 phases
This will make it possible to start some key services before mounting
data partition

(cherry picked from commit abfbec342f)

Bug: 30118894
Change-Id: Ia9f8cc035de6cc0df9a61605864915efa0266d7f
2016-09-06 11:39:05 -07:00
Treehugger Robot 85a78f19b1 Merge "Precise command constants on adb/protoxol.txt" 2016-09-06 05:04:13 +00:00
Treehugger Robot d659510522 Merge "liblog: don't bother keeping FD around once it's mapped." 2016-09-05 18:33:03 +00:00
Treehugger Robot 31ea86327e Merge "Use android::base::Readlink in init." 2016-09-02 19:37:02 +00:00
Treehugger Robot 3aaca7dd60 Merge changes I38c76bb2,I81a55e92
* changes:
  logd: clear all from non system user status request
  logd: crash in prune mLastWorstPidOfSystem
2016-09-02 17:31:03 +00:00
Marco Nelissen b7aef300c4 Merge "Allow setting oom_score_adj for services spawned from init" 2016-09-02 14:46:08 +00:00
Mark Salyzyn 43a5f31e94 logd: clear all from non system user status request
pruneRows not necessarily ULONG_MAX when uid not system source,
allow for speed up for status response if pruneRows exhausted.

Change-Id: I38c76bb20215e3d96513a575e2e3bc85a5e5b41c
2016-09-02 07:41:27 -07:00
Mark Salyzyn 1eefca281e logd: crash in prune mLastWorstPidOfSystem
mLastWorstPidOfSystem is supposed to be indexed by element->getPid()

Bug: 31237377
Bug: 30797725
Bug: 30688716
Change-Id: I81a55e92f175ded1c571a0aa8836736d86b36b1d
2016-09-02 07:41:27 -07:00
Josh Gao 37686d446d Merge "Revert "init: create /dev/urandom, /dev/random in first stage."" 2016-09-02 08:41:17 +00:00
Josh Gao 4c8a76e250 Revert "init: create /dev/urandom, /dev/random in first stage."
This reverts commit ab4fbe1b4f.

Bug: http://b/31251721
Change-Id: I43e68d1bd819d0f9f7d107865a33ec892975d956
2016-09-02 08:39:39 +00:00
Josh Gao 50d606528d Merge "Fix adb." 2016-09-02 08:38:05 +00:00
Elliott Hughes 7f4ab76240 Fix adb.
9460de1ce80a41cd6171a7e03d9fa7aef2db9dce had a backwards test that means
all adb commands abort. Fix the sense of the test.

Bug: http://b/30445394
Change-Id: I4b8ee697f7d305b57f9cd1a70ae919869dee994d
2016-09-01 20:48:45 -07:00
Treehugger Robot 1f5a49f77a Merge changes from topic 'adb_cmd_socket'
* changes:
  adb: allow use of arbitrary socket specs for command socket.
  adb: extract the adb-specific unique_fd out into its own header.
  adb: add helper to get the ~/.android directory.
2016-09-02 01:03:12 +00:00
Treehugger Robot f3d43032d2 Merge "libcutils: try all addresses in socket_network_client_timeout." 2016-09-02 00:46:36 +00:00
Treehugger Robot 9baf4e94fa Merge "init: create /dev/urandom, /dev/random in first stage." 2016-09-01 22:57:12 +00:00
Josh Gao 78cc20f007 libcutils: try all addresses in socket_network_client_timeout.
If a connection fails to an address that resolves to multiple
sockaddrs, attempt connecting to subsequent addresses if the initial
connection fails to a reason other than timeout. This is primarily
useful for localhost, which can resolve to both an IPv4 and and IPv6
address.

Also, add an adb test to verify that this behavior.

Bug: http://b/30313466
Change-Id: Ib2df706a66cf6ef8c1097fdfd7aedb69b8df2d6e
Test: python test_adb.py (+ the test fails before this patch)
2016-09-01 15:56:58 -07:00
Josh Gao 9c869b58a8 adb: allow use of arbitrary socket specs for command socket.
Bug: http://b/30445394
Change-Id: I474ede35ec3c56ad86da503c9703f83ef5e80862
2016-09-01 15:49:06 -07:00
Josh Gao 924d35a8d5 adb: extract the adb-specific unique_fd out into its own header.
Some POSIX-only files would like to use functions declared in
adb_utils.h without being forced to use the sysdeps stuff for open,
close, etc. Extract the adb-specific unique_fd into its own header so
those files can use adb_utils.h alongside the real unique_fd.

Change-Id: I10344ef26b7e72fce46bf7e3033f89aa54bd6118
Test: mm
2016-09-01 15:49:06 -07:00