Commit Graph

22239 Commits

Author SHA1 Message Date
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 7f766bc87b Merge "adb: symlinks to dirs count as dirs for pull destination." am: 543093cb97
am: 3b198fd8bb

* commit '3b198fd8bbbbb783f07e3cbd7c78973e94119534':
  adb: symlinks to dirs count as dirs for pull destination.
2016-03-03 01:40:17 +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
Andreas Gampe fee8a7896c Merge "Revert "Do not do local unwinds through .oat or .dex maps."" am: 9220b98fa5
am: aea086a79a

* commit 'aea086a79a57dc668b3431fdf2c5dce52b5cd0ed':
  Revert "Do not do local unwinds through .oat or .dex maps."
2016-03-02 22:51:36 +00: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
Andreas Gampe a7a7369343 Revert "Do not do local unwinds through .oat or .dex maps."
This reverts commit 4265ed7cc8.

Workaround in libunwind instead: change-id I98be5754cc4de4071616db334dc0c9862d3a2504

Bug: 27391690

(cherry picked from commit 04dcb00ab7)

Change-Id: Id77dc081b655dc0fcb513ad0ee95221d91a301f9
2016-03-02 13:20:35 -08: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 df7a54e60e Merge changes I6fdc87e8,I91b060b2 am: 85c5fc41de
am: 42dc8010aa

* commit '42dc8010aa3f3662214562c46843e2ecd9e28b41':
  logd: check return values
  logd: clarify release_Locked() for static analyzer
2016-03-02 19:52:52 +00:00
Mark Salyzyn d7332d6d21 logd: check return values
am: 07522c6e9b

* commit '07522c6e9b8acba0f5cfb274d4514014749475e8':
  logd: check return values
2016-03-02 19:47:17 +00:00
Mark Salyzyn 13b3d68a61 logd: clarify release_Locked() for static analyzer
am: c348416198

* commit 'c3484161980cdea915c893a233f54b14a75d151f':
  logd: clarify release_Locked() for static analyzer
2016-03-02 19:46:54 +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 07522c6e9b logd: check return values
(cherry pick from commit bf7d0b8875)

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 11:37:21 -08:00
Mark Salyzyn c348416198 logd: clarify release_Locked() for static analyzer
(cherry pick from commit 0ecdec7a09)

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 11:37:21 -08: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
Elliott Hughes a3f25728ff Make toolbox top a little more like everyone else\'s.
am: 539a79e529

* commit '539a79e5295e83ab1070de6082988f6b5fe7eae0':
  Make toolbox top a little more like everyone else's.
2016-03-02 18:04:54 +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 e17ad36907 Merge "Make toolbox top a little more like everyone else\'s." am: d1ec9c450d
am: be44dba86d

* commit 'be44dba86d57b9c071b6ced625d569f8f4be719d':
  Make toolbox top a little more like everyone else's.
2016-03-02 16:43:45 +00: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 539a79e529 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

(cherry picked from commit fd64c5d07e)

Change-Id: I4aa0bcebe08fbb5d3430311fd501a50352e58a0d
2016-03-02 08:42:18 -08: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 05de11746a Merge "Do not do local unwinds through .oat or .dex maps." am: 48d930d0a9
am: bf89fc7954

* commit 'bf89fc7954909e434a30939e6176091f19910896':
  Do not do local unwinds through .oat or .dex maps.
2016-03-02 03:55:33 +00:00
Christopher Ferris a172783680 Merge "Do not do local unwinds through .oat or .dex maps." into nyc-dev
am: bb7ed0141b

* commit 'bb7ed0141b0084c1ef3496fb9fbc820563a53329':
  Do not do local unwinds through .oat or .dex maps.
2016-03-02 03:50:35 +00: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
Andreas Gampe bb7ed0141b Merge "Do not do local unwinds through .oat or .dex maps." into nyc-dev 2016-03-02 03:40:41 +00:00
Christopher Ferris 48d930d0a9 Merge "Do not do local unwinds through .oat or .dex maps." 2016-03-02 03:40:09 +00:00
bohu 372b84821e Emulator: fix adbd qemu pipe partial write
am: 8ac1b044af

* commit '8ac1b044afd879ff6e0bb969d6c25c89b1869ea8':
  Emulator: fix adbd qemu pipe partial write
2016-03-02 02:38:42 +00:00
Christopher Ferris b035a19e4f Do not do local unwinds through .oat or .dex maps.
Bug: 27391690

(cherry picked from commit 4265ed7cc8)

Change-Id: I88a49537544b507a3b0bfa61eafc27400a05281b
2016-03-01 18:19:42 -08: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 32e55d70c4 Merge "Emulator: fix adbd qemu pipe partial write" am: ae607e149b
am: 4cc3354fb7

* commit '4cc3354fb75363cc8107162f338bc3872c22550c':
  Emulator: fix adbd qemu pipe partial write
2016-03-02 01:55:44 +00: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
bohu 8ac1b044af 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.

(cherry picked from commit f66c5938be)

Change-Id: I684f5df79b1e3f00b4b7a2452c2712a73c15973c
2016-03-01 17:39:31 -08: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
Keun Soo Yim 0f552607c1 Merge "mkdir /data/misc/cameraserver for AVD\'s camera HALs" into nyc-dev
am: 2d750b266b

* commit '2d750b266b9f64e4102ab47d2d38e84874c0a1d2':
  mkdir /data/misc/cameraserver for AVD's camera HALs
2016-03-01 23:11:10 +00:00
Keun Soo Yim 2d750b266b Merge "mkdir /data/misc/cameraserver for AVD's camera HALs" into nyc-dev 2016-03-01 22:49:48 +00:00
Keun Soo Yim be54c543bd mkdir /data/misc/cameraserver for AVD's camera HALs
cameraserver from nyc uses cameraserver as its username.
thus this change is needed for AVD (android virtual device)'s
camera HAL which is attached to cameraserver to work as that
HAL writes some files to /data/misc/media. the backward compatibility
issue should be handled as separate changes. this approach is 
preferred for finer-grained security isolation.

Change-Id: If028667d62df8fcac634ff1001759c39703b00dd
2016-03-01 22:44:59 +00:00
Josh Gao b012c1cb1f Merge "adb: report progress for small files." am: 4c87588fa2
am: d799184236

* commit 'd799184236e8a63310f21d1509e656f9322ee300':
  adb: report progress for small files.
2016-03-01 20:38:41 +00: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 650ba8b8d6 Merge "system/core/lib[c]utils: Fix signedness comparison warnings." am: bba2151b29
am: 65df16b05f

* commit '65df16b05f8d590e1fccc19e9a28833d6a71567d':
  system/core/lib[c]utils: Fix signedness comparison warnings.
2016-03-01 20:32:09 +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