Commit graph

19973 commits

Author SHA1 Message Date
Dimitry Ivanov
6399d525a1 Merge "Fix locking of libnativeloader"
am: 17741bc85c

* commit '17741bc85c0570a4f01bf8c945db1cd1b117a19a':
  Fix locking of libnativeloader
2016-03-03 17:12:16 +00:00
Dimitry Ivanov
f5a05ba30a Merge "Added function to explicitly initialize a namespace"
am: 82ae2c0958

* commit '82ae2c0958c5076b33172622114ad0c4f06fd256':
  Added function to explicitly initialize a namespace
2016-03-03 17:12:07 +00:00
Dimitry Ivanov
17741bc85c Merge "Fix locking of libnativeloader" 2016-03-03 17:05:45 +00:00
Dimitry Ivanov
82ae2c0958 Merge "Added function to explicitly initialize a namespace" 2016-03-03 17:05:16 +00:00
David Pursell
a942881fdb Merge "adb: relax serial matching rules."
am: b4709c2cfd

* commit 'b4709c2cfd2a31b032d25c6b9eaa495c3092aeaa':
  adb: relax serial matching rules.
2016-03-03 16:55:44 +00:00
David Pursell
b4709c2cfd Merge "adb: relax serial matching rules." 2016-03-03 16:44:58 +00:00
Josh Gao
3b198fd8bb Merge "adb: symlinks to dirs count as dirs for pull destination."
am: 543093cb97

* commit '543093cb97958049d175ecd77d5232659b014f7d':
  adb: symlinks to dirs count as dirs for pull destination.
2016-03-03 00:50:20 +00:00
Josh Gao
543093cb97 Merge "adb: symlinks to dirs count as dirs for pull destination." 2016-03-03 00:36:22 +00:00
Josh Gao
1e611a33d5 adb: symlinks to dirs count as dirs for pull destination.
This matches scp's behavior when pulling a directory that collides
with a symlink to a directory.

Bug: http://b/27362811
Change-Id: I0936d1ad48f13e24cd382e8e8400cc752bac3b66
2016-03-02 15:29:02 -08:00
Alex Deymo
bb968fb04d Add /postinstall partition when using the A/B updater.
The new top level directory /postinstall is used by the A/B updater to
mount the new partition and run a post-install program before rebooting
into that new system.

init.rc was extended to label this new directory since the initrd has
no extended attributes.

Bug: 27177071
TEST=`ls -laZ /` shows the /postinstall directory on edison-eng

Change-Id: I6cdee7eb1d61ac7d447528962a4fad1a7bbf138d
2016-03-02 14:17:42 -08:00
Andreas Gampe
aea086a79a Merge "Revert "Do not do local unwinds through .oat or .dex maps.""
am: 9220b98fa5

* commit '9220b98fa5435665a5c8cf1afdd5938d6323ccba':
  Revert "Do not do local unwinds through .oat or .dex maps."
2016-03-02 21:33:10 +00:00
David Pursell
3f902aad5b adb: relax serial matching rules.
Currently targeting a device by serial requires matching the serial
number exactly. This CL relaxes the matching rules for local transports
to ignore protocol prefixes and make the port optional:
  [tcp:|udp:]<hostname>[:port]

The purpose of this is to allow a user to set ANDROID_SERIAL to
something like "tcp:100.100.100.100" and have it work for both fastboot
and adb (assuming the device comes up at 100.100.100.100 in both
modes).

This CL also adds some unit tests for the modified functions to make
sure they work as expected.

Bug: 27340240
Change-Id: I006e0c70c84331ab44d05d0a0f462d06592eb879
2016-03-02 12:54:58 -08:00
Andreas Gampe
9220b98fa5 Merge "Revert "Do not do local unwinds through .oat or .dex maps."" 2016-03-02 20:52:59 +00:00
Mark Salyzyn
42dc8010aa Merge changes I6fdc87e8,I91b060b2
am: 85c5fc41de

* commit '85c5fc41de8067a389dba1d3871850a74ce36c91':
  logd: check return values
  logd: clarify release_Locked() for static analyzer
2016-03-02 19:42:49 +00:00
Andreas Gampe
04dcb00ab7 Revert "Do not do local unwinds through .oat or .dex maps."
This reverts commit 4265ed7cc8.

Workaround in libunwind instead: change-id I98be5754cc4de4071616db334dc0c9862d3a2504

Bug: 27391690
Change-Id: Id77dc081b655dc0fcb513ad0ee95221d91a301f9
2016-03-02 19:39:21 +00:00
Mark Salyzyn
85c5fc41de Merge changes I6fdc87e8,I91b060b2
* changes:
  logd: check return values
  logd: clarify release_Locked() for static analyzer
2016-03-02 19:34:18 +00:00
Chih-Hung Hsieh
7e0e14ca84 Make CHECK(x) work with static analyzer.
When __clang_analyzer__ is defined call abort after FATAL LogMessage.
BUG: 27379879

Change-Id: I198aad2be1191b6eb45db5333f94436f619facd9
2016-03-02 09:23:02 -08:00
Elliott Hughes
be44dba86d Merge "Make toolbox top a little more like everyone else\'s."
am: d1ec9c450d

* commit 'd1ec9c450d8dc9d24b5f0254111449ecfcbeaea6':
  Make toolbox top a little more like everyone else's.
2016-03-02 16:43:13 +00:00
Elliott Hughes
d1ec9c450d Merge "Make toolbox top a little more like everyone else's." 2016-03-02 16:41:47 +00:00
Mark Salyzyn
bf7d0b8875 logd: check return values
The setgid() and setuid() call failure in logd.daemon thread
do not block overall functionality, so clearly tell static
analyzer and developers that we do not care to check their
return values.

SideEffects: None

Bug: 27434072
Change-Id: I6fdc87e8311ebc0173716080bbd72c86b3f00f78
2016-03-02 07:54:45 -08:00
Elliott Hughes
fd64c5d07e Make toolbox top a little more like everyone else's.
The use of PR to mean PSR rather than PR was confusing, so let's just
use PR and NI the same way everyone else does.

Also remove bogus blank lines and unnecessary delays (both before first
showing anything and after having shown the final iteration).

Bug: http://b/27447491
Change-Id: I676131956facf2167abb5d0852c55b0670b5eaa6
2016-03-02 07:49:03 -08:00
Mark Salyzyn
0ecdec7a09 logd: clarify release_Locked() for static analyzer
release_Locked() is called with a reference count and threadRunning,
the static analyzer can not tell this and estimates that a call to
delete this will occur. So let us invent a new call
release_nodelete_Locked() to ensure it is clear we will not be
arranging a delete this in the context of this code path. The
delete this will follow in the immediate codepath in this function
after threadRunning is cleared, and decRef_Locked() is called.

Change will also remove any developer FUD regarding release_Locked()
usage at this location.

SideEffects: None

Bug: 27434831
Change-Id: I91b060b2dadc72cc449fa381c934afb577bee037
2016-03-02 07:38:34 -08:00
Christopher Ferris
bf89fc7954 Merge "Do not do local unwinds through .oat or .dex maps."
am: 48d930d0a9

* commit '48d930d0a9805c681bf6465bcd71b28a31861cd5':
  Do not do local unwinds through .oat or .dex maps.
2016-03-02 03:50:01 +00:00
Christopher Ferris
48d930d0a9 Merge "Do not do local unwinds through .oat or .dex maps." 2016-03-02 03:40:09 +00:00
Christopher Ferris
4265ed7cc8 Do not do local unwinds through .oat or .dex maps.
Bug: 27391690
Change-Id: I88a49537544b507a3b0bfa61eafc27400a05281b
2016-03-01 18:07:59 -08:00
bohu
4cc3354fb7 Merge "Emulator: fix adbd qemu pipe partial write"
am: ae607e149b

* commit 'ae607e149bbb4b8a8e441fd64147856c69862710':
  Emulator: fix adbd qemu pipe partial write
2016-03-02 01:47:57 +00:00
Bo Hu
ae607e149b Merge "Emulator: fix adbd qemu pipe partial write" 2016-03-02 01:35:33 +00:00
bohu
f66c5938be Emulator: fix adbd qemu pipe partial write
It does happens that the adb_write only writes to the
qemu pipe partially which throws host side's adb backend
into confusion and crashes.

This CL replaces adb_write with WriteFdExactly;
adb_read with ReadFdExactly.

Change-Id: I10424ad730c73516d16b0eb7318e8c9beea9b36b
2016-03-01 17:33:57 -08:00
Josh Gao
d799184236 Merge "adb: report progress for small files."
am: 4c87588fa2

* commit '4c87588fa2676d99c4ebca9a59b26adf0ef89e82':
  adb: report progress for small files.
2016-03-01 20:38:13 +00:00
Josh Gao
4c87588fa2 Merge "adb: report progress for small files." 2016-03-01 20:37:13 +00:00
James Hawkins
65df16b05f Merge "system/core/lib[c]utils: Fix signedness comparison warnings."
am: bba2151b29

* commit 'bba2151b29eb585b572eafc735917d7d74a2c0ad':
  system/core/lib[c]utils: Fix signedness comparison warnings.
2016-03-01 20:28:13 +00:00
James Hawkins
bba2151b29 Merge "system/core/lib[c]utils: Fix signedness comparison warnings." 2016-03-01 20:26:32 +00:00
Josh Gao
9fd2f77dcc adb: report progress for small files.
Bug: http://b/27407725
Change-Id: I7515144402a487fb3d4d403e2f5f82423c1b5ed6
2016-03-01 11:52:55 -08:00
James Hawkins
b898075f30 system/core/lib[c]utils: Fix signedness comparison warnings.
* Store the output of a length variable in size_t.
* Annotate unsigned constant values as such.

Bug: 27384813
Change-Id: I8504c0a8f5840d4d42e5c0df797a4e5d02d13eb9
2016-03-01 11:21:53 -08:00
Ying Wang
aa88fa5837 Merge "Also archive adb.exe/fastboot.exe when building win_sdk."
am: f666ba41a7

* commit 'f666ba41a729834bf15296ab13a92f33c5b0d592':
  Also archive adb.exe/fastboot.exe when building win_sdk.
2016-03-01 17:30:05 +00:00
Ying Wang
f666ba41a7 Merge "Also archive adb.exe/fastboot.exe when building win_sdk." 2016-03-01 17:27:56 +00:00
Ying Wang
71edfc8b9a Also archive adb.exe/fastboot.exe when building win_sdk.
On linux we archive both Linux and Windows binaries.

Bug: 27315911
Change-Id: I17d25cd1ea611a9c917f1e78b47f21a8959eea20
2016-02-29 19:27:06 -08:00
Sami Tolvanen
126527e74b Merge "logd: add a comment about untrusted content in the audit log"
am: 68de85bda9

* commit '68de85bda98d7d03f63134209f9e2c149cad1852':
  logd: add a comment about untrusted content in the audit log
2016-02-29 22:23:59 +00:00
Sami Tolvanen
68de85bda9 Merge "logd: add a comment about untrusted content in the audit log" 2016-02-29 22:22:15 +00:00
James Hawkins
974bae41da Merge "crash_reporter: Mark the euid parameter as __unused."
am: c625acf217

* commit 'c625acf21701af0f8a57a443a16240ea6e499774':
  crash_reporter: Mark the euid parameter as __unused.
2016-02-29 22:14:47 +00:00
James Hawkins
c625acf217 Merge "crash_reporter: Mark the euid parameter as __unused." 2016-02-29 22:12:51 +00:00
Sami Tolvanen
2060a83775 logd: add a comment about untrusted content in the audit log
A single space character in search terms separates us from a denial of
service attack that forces the device into safe mode.  This CL adds a
comment that hopefully stops the spaces from being accidentally deleted
in future.

Change-Id: I33b2632ef4211fa1688ac9c8f0cf7d0c667766c1
2016-02-29 14:10:59 -08:00
Dimitry Ivanov
1dff1aa97c Fix locking of libnativeloader
This commit fixes race condition introduced in
d047c925af

Bug: http://b/27189432
Bug: http://b/22548808
Change-Id: I5d94f130937f18d3443878b3521715a8f87427e0
(cherry picked from commit 34d5a20c8b)
2016-02-29 13:31:26 -08:00
Sami Tolvanen
892cda4397 Merge "logd: stop log spam when integrity enforcement is suppressed"
am: 9218477ae7

* commit '9218477ae7a3561f258e587b225cadfd73f0ed04':
  logd: stop log spam when integrity enforcement is suppressed
2016-02-29 20:31:12 +00:00
Sami Tolvanen
9218477ae7 Merge "logd: stop log spam when integrity enforcement is suppressed" 2016-02-29 20:28:54 +00:00
Sami Tolvanen
abda9340e6 logd: stop log spam when integrity enforcement is suppressed
Bug: 27389331
Change-Id: I9f3bc21eb1b85b9fda4fa0a5c5b4da94e5e7cc1c
2016-02-29 12:08:39 -08:00
Bernhard Rosenkränzer
e487732935 Merge "Allow building with Python 3.x"
am: a335367bb0

* commit 'a335367bb02b759e5fa5aab535989f61ba691323':
  Allow building with Python 3.x
2016-02-29 19:18:27 +00:00
Dan Albert
a335367bb0 Merge "Allow building with Python 3.x" 2016-02-29 19:16:52 +00:00
Dan Willemsen
ea29d56873 Merge "liblog: Update Android.bp for Android.mk changes"
am: d480a99b0c

* commit 'd480a99b0cefd17a120919c662bfc6d303cffddd':
  liblog: Update Android.bp for Android.mk changes
2016-02-29 19:06:32 +00:00
Dan Willemsen
d480a99b0c Merge "liblog: Update Android.bp for Android.mk changes" 2016-02-29 19:05:39 +00:00