Commit graph

24013 commits

Author SHA1 Message Date
Andreas Gampe
e79e419212 Merge "Base: Fix logging_test"
am: 3b80e5bc9f

Change-Id: I7c0d1e62e5d99d2d9d87ffd6d0e6f228ccdb3dd1
2016-09-07 20:16:10 +00: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
eef52c49d7 Merge "Split fstab mount into 2 phases"
am: f74553f852

Change-Id: I17d0fc5e93fb080408e3ea4738c53a347e9f65d9
2016-09-06 20:18:31 +00:00
Wei Wang
1fe29ced89 Split fstab mount into 2 phases
am: 254f44363b

Change-Id: I1925c658763f80d678b615ce2877208ff95d4033
2016-09-06 20:18:30 +00: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
Eyal Lezmy
f8188895a1 Merge "Precise command constants on adb/protoxol.txt"
am: 85a78f19b1

Change-Id: Ied63c7e5fe798a646d5428aba4fdfa94cf1c53f1
2016-09-06 05:12:47 +00:00
Treehugger Robot
85a78f19b1 Merge "Precise command constants on adb/protoxol.txt" 2016-09-06 05:04:13 +00:00
Narayan Kamath
5ae5b2c580 Merge "liblog: don't bother keeping FD around once it's mapped."
am: d659510522

Change-Id: Iec9b0a52e0b2dd3f8d6dee30cef66f15f227bb66
2016-09-05 18:41:09 +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
Elliott Hughes
72887a3ff4 Merge "Use android::base::Readlink in init."
am: 31ea86327e

Change-Id: Icf9ec5e25114f86fd2e0c5c99810116c3c1497d9
2016-09-02 19:41:42 +00:00
Treehugger Robot
31ea86327e Merge "Use android::base::Readlink in init." 2016-09-02 19:37:02 +00:00
Mark Salyzyn
803e6a71f8 Merge changes I38c76bb2,I81a55e92
am: 3aaca7dd60

Change-Id: I97c472d0c9f351606651bca5920ba990b0cb48a4
2016-09-02 17:41:07 +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
5969a3f780 Merge "Allow setting oom_score_adj for services spawned from init"
am: b7aef300c4

Change-Id: Idb6c8c7b62fd2744da63ea18d35a6d2847eae109
2016-09-02 14:52:27 +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
8196f4cdd9 Merge "Revert "init: create /dev/urandom, /dev/random in first stage.""
am: 37686d446d

Change-Id: Id35b6ac75add1215177e98cbe73e26666d76564b
2016-09-02 08:46:10 +00:00
Josh Gao
ff6d1a9656 Merge "Fix adb."
am: 50d606528d

Change-Id: I55b6c174b4e57086b370e44ff7c0de053f2b4ad6
2016-09-02 08:46:07 +00: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
Josh Gao
db3c28f0d2 Merge changes from topic 'adb_cmd_socket'
am: 1f5a49f77a

Change-Id: I81b1e8e7d23f40fd82707f7744c197e25378efb6
2016-09-02 01:08:46 +00:00
Josh Gao
15f75ef520 adb: allow use of arbitrary socket specs for command socket.
am: 9c869b58a8

Change-Id: Ide2b50bf204657de7d93908970c4e7ab85f7eed5
2016-09-02 01:08:45 +00:00
Josh Gao
2c6ff3d2b5 adb: extract the adb-specific unique_fd out into its own header.
am: 924d35a8d5

Change-Id: Ib557fbafefe6c281230fdeaaea4db03f6cbd7df0
2016-09-02 01:08:41 +00:00
Josh Gao
36796df275 adb: add helper to get the ~/.android directory.
am: e0b7502c7f

Change-Id: I2859a6b3022a97d2b01d6850bcefe77307726904
2016-09-02 01:08:38 +00: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
Josh Gao
b7011e0410 Merge "libcutils: try all addresses in socket_network_client_timeout."
am: f3d43032d2

Change-Id: I373ce6f43a7164754930c62c7fe249ed6530cfd0
2016-09-02 00:52:38 +00:00
Treehugger Robot
f3d43032d2 Merge "libcutils: try all addresses in socket_network_client_timeout." 2016-09-02 00:46:36 +00:00
Josh Gao
344e2b307b Merge "init: create /dev/urandom, /dev/random in first stage."
am: 9baf4e94fa

Change-Id: I39a3b752e4f39411e754fd041f1f7f8fb878b98f
2016-09-01 23:02:31 +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
Andreas Gampe
347eae5ea9 Merge "Base: assume and use C++11 in libbase"
am: 43824e72c7

Change-Id: I92d9e92aed253803ffb9255a96717947fc117c5b
2016-09-01 22:43:29 +00:00
Josh Gao
e0b7502c7f adb: add helper to get the ~/.android directory.
Extract the logic for creating ~/.android out of get_user_key_path into
its own function. Also, fall back to getpwuid_r when $HOME isn't
defined.

Change-Id: I676a7c750cb364f89b544818ffda07903d14fb97
Test: ran adb with ~/.android missing
2016-09-01 15:43:22 -07:00
Treehugger Robot
43824e72c7 Merge "Base: assume and use C++11 in libbase" 2016-09-01 22:32:42 +00:00
Andreas Gampe
22847131da Base: assume and use C++11 in libbase
Assume C++11 support. logging.h already used constexpr before,
macros.h now also does no longer check the language level.

Use constexpr for the logging evaluator. This allows the usage
of CHECK and co in other constexpr expressions in C++14.

Test: m checkbuild (N9)
Change-Id: Ifdffa074271fff1f9949c48829a185800ec5e524
2016-09-01 13:38:12 -07:00
Josh Gao
d402932732 Merge "base: use _NSGetExecutablePath in GetExecutablePath"
am: 8e7ae1e381

Change-Id: I1616ffbc7824cf27d880ba110d7f000d59521e6c
2016-09-01 19:47:48 +00:00
Josh Gao
8e7ae1e381 Merge "base: use _NSGetExecutablePath in GetExecutablePath" 2016-09-01 19:37:12 +00:00
Josh Gao
7307f09457 base: use _NSGetExecutablePath in GetExecutablePath
Bug: http://b/31240820
Change-Id: I0dbf95d3667c7ce7b474ddbb3f8e3ed69476d13e
Test: mma && adb kill-server && adb devices
2016-09-01 12:32:35 -07:00
Josh Gao
289240f0bf Merge "Add android::base::GetExecutablePath, switch adb and fastboot over."
am: 945d1aaa32

Change-Id: I978edcc27401c174a771ab22be1a8b9abcb55d5f
2016-09-01 18:50:01 +00:00
Josh Gao
945d1aaa32 Merge "Add android::base::GetExecutablePath, switch adb and fastboot over." 2016-09-01 18:38:12 +00:00
Narayan Kamath
b2f019ec1e liblog: don't bother keeping FD around once it's mapped.
Posix and linux explicitly state that this isn't necessary.

bug: 30963384
Change-Id: I2cc16ded04f0ebc909dc3027e02867594fb49d05
2016-09-01 19:31:08 +01:00
Elliott Hughes
82ff315bb0 Add android::base::GetExecutablePath, switch adb and fastboot over.
We'd long had two copies of this stuff, so rather than rewrite both
Linux versions to use android::base::Readlink, let's kill the duplication
too...

Bug: http://b/30988271
Change-Id: I4de58a94a22a4b1faf969a6fc70ca1560a4d5121
2016-09-01 09:24:24 -07:00
Marco Nelissen
310f6704d0 Allow setting oom_score_adj for services spawned from init
(cherry picked from commit f7adf8e4739812a2a4f194b17f84f4b9df42d04b)

Bug: 29831602
Change-Id: I4d24264bb6e879935a0b2adbb2e49ddf458980cf
2016-09-01 08:23:28 -07:00
Josh Gao
ab4fbe1b4f init: create /dev/urandom, /dev/random in first stage.
Create /dev/random and /dev/urandom in the first stage, so that when we
reexec, arc4random is available for libc initialization.

Bug: http://b/29622562
Change-Id: I5b2071539a17eec609faac91dc28b08eba5ff89b
2016-08-31 15:36:37 -07:00