Commit graph

19546 commits

Author SHA1 Message Date
Mark Salyzyn
1c92d83cda Merge "logd: test wrap functionality" 2016-01-25 22:45:28 +00:00
Josh Gao
7f3dd26610 Merge "Use dlmalloc from external/dlmalloc instead of bionic/."
am: 506d233e7a

* commit '506d233e7ac8ca4efa80768153d842c296477f99':
  Use dlmalloc from external/dlmalloc instead of bionic/.
2016-01-25 18:50:42 +00:00
Josh Gao
506d233e7a Merge "Use dlmalloc from external/dlmalloc instead of bionic/." 2016-01-25 18:42:54 +00:00
Tom Cherry
9262e5fdcd Merge "init: Update readme.txt to reflect recent changes to init"
am: d401eba04c

* commit 'd401eba04c26bc4ce8b020fb683a93694672fb1b':
  init: Update readme.txt to reflect recent changes to init
2016-01-25 18:20:02 +00:00
Tom Cherry
d401eba04c Merge "init: Update readme.txt to reflect recent changes to init" 2016-01-25 18:15:33 +00:00
Marco Nelissen
e40b58328f Merge "uid for codec process"
am: c7096b5e42

* commit 'c7096b5e42466b6ca627c0d0829064fd21ec4483':
  uid for codec process
2016-01-25 16:55:32 +00:00
Marco Nelissen
c7096b5e42 Merge "uid for codec process" 2016-01-25 16:51:05 +00:00
Marco Nelissen
003c07238a uid for codec process
Change-Id: Iadf8012e6c177bcf487048e1b5a9b4fc51a0aeba
2016-01-25 07:49:39 -08:00
Tom Cherry
1fb20b8377 init: Update readme.txt to reflect recent changes to init
Best practice for services that reside on the system, vendor, and odm
partitions is to have a corresponding init .rc file in the
/{system,vendor,odm}/etc/init directory, which contains its service
entry and any related actions.

Change-Id: I26204f9a0f09ce8069f3791ccd9ee61d164a048f
2016-01-23 05:23:39 +00:00
Ian Pedowitz
ecab47c19a Merge "Removing -std=c++14 from bootstat Android.mk"
am: 4606c95760

* commit '4606c9576019ac419b7abd83eb3a7dcd1f16df81':
  Removing -std=c++14 from bootstat Android.mk
2016-01-23 05:14:52 +00:00
Ian Pedowitz
4606c95760 Merge "Removing -std=c++14 from bootstat Android.mk" 2016-01-23 05:10:42 +00:00
Ian Pedowitz
5699ee889a Removing -std=c++14 from bootstat Android.mk
From comments in 7e04be06d1, this
is not needed.

Change-Id: I427efac8d5e0750ea5f4e77e1582d134d9cae089
2016-01-22 20:33:04 -08:00
Nick Kralevich
9deaf7c8a6 Merge "init.rc: mix device-specific data into the Linux RNG"
am: e04b60d2b9

* commit 'e04b60d2b9bf0e6560e3cde6f671f294b796fcdb':
  init.rc: mix device-specific data into the Linux RNG
2016-01-23 04:02:51 +00:00
Nick Kralevich
e04b60d2b9 Merge "init.rc: mix device-specific data into the Linux RNG" 2016-01-23 03:59:52 +00:00
Nick Kralevich
27cb410352 init.rc: mix device-specific data into the Linux RNG
Mix the contents of /proc/cmdline and /default.prop
into /dev/urandom. /proc/cmdline often contains
androidboot.serialno, a device-specific unique
identifier. Similarly, /default.prop contains the
build fingerprint and timestamp, which vary between
device families.

Change-Id: I8803b38c7089b2a1217b99a7c1808b29a3b138cf
2016-01-22 19:58:21 -08:00
Rom Lemarchand
7b7b872e8e Merge "bootstat: Use Clang and c++14 standard"
am: 738f0e3edf

* commit '738f0e3edf278809e6a9f08469820480064742a0':
  bootstat: Use Clang and c++14 standard
2016-01-23 03:51:35 +00:00
Rom Lemarchand
738f0e3edf Merge "bootstat: Use Clang and c++14 standard" 2016-01-23 03:41:39 +00:00
Rom Lemarchand
7e04be06d1 bootstat: Use Clang and c++14 standard
Change-Id: Ic156eea4d8731e67b26da0a56a7e69b13df659cb
2016-01-22 19:11:20 -08:00
Bertrand Simonnet
b65e80e534 Merge "metricsd: Add more assert clause."
am: 8f8ce0c300

* commit '8f8ce0c3002430bfbbbc95eb3c2a97efa1ac8e36':
  metricsd: Add more assert clause.
2016-01-22 22:24:35 +00:00
Bertrand Simonnet
8f8ce0c300 Merge "metricsd: Add more assert clause." 2016-01-22 22:06:51 +00:00
Bertrand SIMONNET
f1aa372f77 metricsd: Add more assert clause.
This CL adds two more checks:
* When populating a closed log with the metadata, make sure the
  SystemProfileSetter is not null.
* When using the update engine client library, check if the update
  engine client object was created correctly. The returning object can
  be null if update engine's binder service is not running.

Bug: 26731548

Change-Id: I8a615c87f33e15a163d56ccfa3a932a0908aac5f
2016-01-22 13:16:30 -08:00
James Hawkins
4ac60013d4 Merge "bootstat: Fix the build on git_mnc-dr1.5-dev-plus-aosp by adding missing C++ includes"
am: 2026cca40f

* commit '2026cca40fe013ed98df144cde4472f3824ca038':
  bootstat: Fix the build on git_mnc-dr1.5-dev-plus-aosp by adding missing C++ includes
2016-01-22 19:36:26 +00:00
James Hawkins
2026cca40f Merge "bootstat: Fix the build on git_mnc-dr1.5-dev-plus-aosp by adding missing C++ includes" 2016-01-22 19:10:46 +00:00
James Hawkins
5cd4bc299b bootstat: Fix the build on git_mnc-dr1.5-dev-plus-aosp by adding missing
C++ includes

Bug: 21724738
Change-Id: I27e1e8d7897302a1f2d1e4d44c226450194f1933
2016-01-22 11:07:51 -08:00
Josh Gao
70bde21ae4 Use dlmalloc from external/dlmalloc instead of bionic/.
Bug: http://b/17207577
Change-Id: Ib9b4cd417091b765402ad217ae0b5a10e3ffbc23
2016-01-22 11:04:35 -08:00
David Pursell
ff81cd2727 Merge "adb: fix GetFeatureSet() to indicate failure."
am: 921b8e19ee

* commit '921b8e19eea5ca02ed9d95332405c6dd720f60f3':
  adb: fix GetFeatureSet() to indicate failure.
2016-01-22 18:44:38 +00:00
David Pursell
921b8e19ee Merge "adb: fix GetFeatureSet() to indicate failure." 2016-01-22 18:30:40 +00:00
David Pursell
0aacbbe9f3 adb: fix GetFeatureSet() to indicate failure.
Previously GetFeatureSet() on an invalid target would just return an
empty feature set, leading to some invalid assumptions, e.g. if there
isn't exactly one device connected this happens:

$ adb shell -t
error: target doesn't support PTY args -Tt

This CL adds a success/failure return value to GetFeatureSet(), and
also adds an option to print errors to stderr since that's the most
common behavior.

This will cause a slight difference in behavior for install/uninstall.
Previously they would block until the device was available, now they
print an error and quit immediately, which seems to be the more common
behavior for adb functions.

Bug: http://b/26387641
Change-Id: I0ea6ffaec922e04b9946e84f05c3870e5b549fde
2016-01-22 08:49:15 -08:00
David Pursell
cee5418fe4 Merge "base: add network address parsing function from adb."
am: 7fc87c9bc2

* commit '7fc87c9bc2b10eae7f5fa08708fd613186887d92':
  base: add network address parsing function from adb.
2016-01-22 16:25:13 +00:00
David Pursell
7fc87c9bc2 Merge "base: add network address parsing function from adb." 2016-01-22 16:20:33 +00:00
David Pursell
706955ff0d base: add network address parsing function from adb.
This CL moves the network address parsing function from adb to libbase
so that it can be used by fastboot as well as adb.

libbase seemed like the right choice because:
  1. It already has some parsing functions (parseint)
  2. The net address parsing function uses the libbase string
     functions so we have a libbase dependency anyway.

The parsing function has been modified slightly to make the canonical
address optional, and debug logging on success has been removed.

For adb the only functional difference is that parsing a network
address will no longer print the result to the debug log, which seemed
unnecessary.

Bug: http://b/26236380
Change-Id: Ife6df02937225fc66de87884d3572d79c092c522
2016-01-21 20:03:33 -08:00
David Pursell
f0bfaf9503 Merge "fastboot: use cutils socket functions."
am: bbedd9523f

* commit 'bbedd9523faf2c56b9c8236b22658bb659eb1533':
  fastboot: use cutils socket functions.
2016-01-22 00:35:01 +00:00
David Pursell
bbedd9523f Merge "fastboot: use cutils socket functions." 2016-01-22 00:07:14 +00:00
Mark Salyzyn
ef4e4f3f07 logd: test wrap functionality
Behavior is modified now, so react by fortifying the tests

Bug: 26447386
Change-Id: I6295783a0bc75282499aeba503a86bdb846908b5
2016-01-21 11:56:23 -08:00
David Pursell
572bce2908 fastboot: use cutils socket functions.
Now that cutils has cross-platform socket functionality, we can
restructure fastboot to remove platform-dependent networking code.

This CL adds socket_set_receive_timeout() to libcutils and combines the
fastboot socket code into a single implementation. It also adds TCP
functionality to fastboot sockets, but nothing uses it yet except for
the unit tests. A future CL will add the TCP protocol which will use
this TCP socket implementation.

Bug: http://b/26558551

Change-Id: If613fb348f9332b31fa2c88d67fb1e839923768a
2016-01-21 09:53:11 -08:00
David Pursell
7a568dbdd6 Merge "libcutils: share Windows networking code."
am: 1906de1e0f

* commit '1906de1e0fb70dbae4a713620072113a76d0a22a':
  libcutils: share Windows networking code.
2016-01-21 17:00:57 +00:00
David Pursell
1906de1e0f Merge "libcutils: share Windows networking code." 2016-01-21 16:40:00 +00:00
Rubin Xu
d61a25c172 ADB security logging
Log adb shell, pull and push operations to the security log.

Bug: 22860162
Change-Id: I5d24e9d51040ae05a41d9fcb079e84351a217bd3
2016-01-21 15:57:02 +00:00
Steve Fung
0c422cb3f1 Merge "crash_reporter: Add unit tests to debug builds"
am: b4cf452aad

* commit 'b4cf452aad90dfd4b0040764831fe6976a2366a9':
  crash_reporter: Add unit tests to debug builds
2016-01-21 05:06:04 +00:00
Steve Fung
cf895dda75 Merge "crash_reporter: Fix unit tests to use ScopedTempDir"
am: 120fe6aef2

* commit '120fe6aef2e9a8baea2d50cd527d1e9138148369':
  crash_reporter: Fix unit tests to use ScopedTempDir
2016-01-21 05:05:55 +00:00
Hung-ying Tyan
436a8aa9de Merge "Allow paths of .rc files to be specified at mount_all"
am: e7f9779886

* commit 'e7f9779886f76bac5388718715b053f9e16af1c9':
  Allow paths of .rc files to be specified at mount_all
2016-01-21 04:56:51 +00:00
Steve Fung
b4cf452aad Merge "crash_reporter: Add unit tests to debug builds" 2016-01-21 04:43:23 +00:00
Steve Fung
120fe6aef2 Merge "crash_reporter: Fix unit tests to use ScopedTempDir" 2016-01-21 04:42:31 +00:00
Hung-ying Tyan
e7f9779886 Merge "Allow paths of .rc files to be specified at mount_all" 2016-01-21 04:12:23 +00:00
Hung-ying Tyan
dc738eaf15 Allow paths of .rc files to be specified at mount_all
In current implementation, the mount_all command imports all .rc files
under /{system,vendor,odm}/etc/init/ after mouting filesystems is complete.
There's a need from ODMs to import different .rc files under different boot
modes (e.g., factory mode). Without this support, they will have to fiddle
around the init implementation.

This commit makes mount_all import the .rc files/directories specified
as additional arguments. If no path is given, the original ones are applied
the same way as the current implementation.

BUG: 26549689
Change-Id: Ie67ce13dde4c440ff8bf534826bc392c882a433f
2016-01-21 09:35:43 +08:00
Alex Vakulenko
84dd2edd53 Merge "libmetrics: Update BASE_VERS to 369476"
am: c937afebd9

* commit 'c937afebd9309da04103beb23c0b47121e1ac947':
  libmetrics: Update BASE_VERS to 369476
2016-01-21 01:28:36 +00:00
Alex Vakulenko
c937afebd9 Merge "libmetrics: Update BASE_VERS to 369476" 2016-01-21 00:23:16 +00:00
Mark Salyzyn
d275bf80d7 Merge "liblog: fix android_log_printLogLine empty event string"
am: 6197e5e611

* commit '6197e5e6111f784dc3c4be7cf9bf39a1d5ecc9c7':
  liblog: fix android_log_printLogLine empty event string
2016-01-21 00:11:01 +00:00
Mark Salyzyn
6197e5e611 Merge "liblog: fix android_log_printLogLine empty event string" 2016-01-20 23:59:12 +00:00
Josh Gao
43568a558d Merge "adbd: use pty to determine whether a session is interactive."
am: 7e923fb3c5

* commit '7e923fb3c5ad5c32978e7bd4dc509501b0d05d72':
  adbd: use pty to determine whether a session is interactive.
2016-01-20 23:53:42 +00:00