Commit graph

22019 commits

Author SHA1 Message Date
Josh Gao
9150b1288e adb: fix fd double close, Subprocess lifetime issue.
am: 69d2f98197

Change-Id: I7797d5dee022bfdd6f165221340095f7836eea99
2016-06-20 23:48:01 +00:00
Josh Gao
69d2f98197 adb: fix fd double close, Subprocess lifetime issue.
This commit fixes two somewhat related issues in shell_service.

  - The fd returned by StartSubprocess is owned by a unique_fd
    contained in the Subprocess object, but also gets closed by the
    caller. Resolve this by duping the returned file descriptor.

  - A Subprocess object can be destroyed immediately after its initial
    construction in StartSubprocess if we're sufficiently unlucky.
    Split up the fork/exec and "start management thread" steps, so that
    we can safely do everything we need to do on the Subprocess before
    handing it over to the thread that'll eventually destroy it.

Also includes squashed patches from AOSP master that allow for use of
unique_fd inside adb.

Bug: http://b/29254462
Change-Id: Id9cf0b7e7a7293bee7176919edc758597691c636
(cherry picked from commit c0e6e40cc9)
(cherry picked from commit 54c72aaccc)
(cherry picked from commit 2c5d1d7cd9)
(cherry picked from commit 2a7b86337f)
(cherry picked from commit 13ea01db45)
(cherry picked from commit 344778da41)
2016-06-20 14:51:05 -07:00
Sami Tolvanen
9af867e7bd fs_mgr_verity: fix verity_update_state for A/B devices
Use the correct device name when system is mounted as root, and
validate dm-verity status to avoid confusing it with dm-linear.

Bug: 29277442
Change-Id: I36e115189f9a9430bad4bf89f26a376bcb8e8168
2016-06-17 17:17:04 -07:00
Alex Light
d9ff210e63 Fix issue where non-AB-ota devices will cause flashall to fail.
We now check that a device has slots before trying to get the name of
any of them.

Bug: 29278988

Change-Id: I50f3596e467afae20177ce4e458e697435223c51
2016-06-16 15:22:22 -07:00
Ruchi Kandoi
13cf49d8eb Merge \"logd: logcat -L takes longer causing vold to timeout.\" into nyc-dev
am: b02819e2af

Change-Id: I0c0fe46e74bfa4e3461454d62b14f98a4f71be96
2016-06-16 17:57:48 +00:00
Ruchi Kandoi
b02819e2af Merge "logd: logcat -L takes longer causing vold to timeout." into nyc-dev 2016-06-16 17:44:30 +00:00
TreeHugger Robot
a3ffde1402 Merge "Make fastboot flash 'B' partitions automatically." into nyc-mr1-dev 2016-06-15 23:09:26 +00:00
Alex Light
6c60ea8c45 Make fastboot flash 'B' partitions automatically.
Also add ability to specify --slot active to suppress this behavior.

Bug: 29278988

Change-Id: I3ff184be74f9e2d1cb3abc80bd206b4b9faf8a35
2016-06-15 14:42:22 -07:00
Sami Tolvanen
998f50749e Revert \"logd: enforce policy integrity\"
am: a742d10277

Change-Id: Idb721b2ff7a57643b671b3d87cb09bb96f1ad465
2016-06-14 22:28:26 +00:00
Ruchi Kandoi
c1b26acae2 logd: logcat -L takes longer causing vold to timeout.
Temporary fix to prevent device from getting stuck at boot.

Bug: 28788401
Change-Id: Ie4246fc3c9eb7a3af2cb909546811c85997515da
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-06-14 15:26:30 -07:00
Dan Stoza
c873d44942 Merge "add android_flex_layout for describing all flexible formats." into nyc-mr1-dev 2016-06-14 19:59:38 +00:00
Sami Tolvanen
a742d10277 Revert "logd: enforce policy integrity"
This reverts commit 0bdad0f231.

Bug: 26902605
Change-Id: I6ce8fa7bef63c45821628265c379970eb64963a2
2016-06-14 11:14:51 -07:00
Daniel Micay
d4421f1962 add a property for controlling perf_event_paranoid
This adds a system property for controlling unprivileged access to
perf_event_paranoid. It depends on adding kernel support for
perf_event_paranoid=3 based on grsecurity's PERF_HARDEN feature to
completely disable unprivileged access to perf. A minimal port of this
feature is used in the vanilla Debian kernel by default.

It hides the non-hardened value as an implementation detail, since while
it is currently 1, it will probably become 2 in the future.

(Cherry picked from commit 2b22a66382)

Bug: 29054680

Change-Id: I6e3ae3cf18d8c76df94f879c34fb6fde519b89a9
2016-06-12 21:20:46 +00:00
Pablo Ceballos
0398ec6326 Merge "Header changes for getFrameTimestamps" into nyc-mr1-dev 2016-06-09 21:10:16 +00:00
Felipe Leme
542fc21d29 Merge \"Redirect bugreport stderr to host\'s stderr.\" into nyc-dev
am: 6d349051ce

Change-Id: I78041cfac6374eb5f2e0ec3478703f7cb03d8623
2016-06-08 23:41:23 +00:00
TreeHugger Robot
6d349051ce Merge "Redirect bugreport stderr to host's stderr." into nyc-dev 2016-06-08 23:35:12 +00:00
Felipe Leme
d1dd125bc2 Redirect bugreport stderr to host's stderr.
Change-Id: I46f474f0b0d5cacdc4b129eab1bb0a7f52ccece0
Fixes: 29161586
2016-06-08 11:09:34 -07:00
Elliott Hughes
2e579ca920 Allow multiple (sequential) adb users on Linux.
am: 75f42d7ea7

Change-Id: I5567c186e9b855ad10d678ac4e212f6948960a08
2016-06-08 17:09:06 +00:00
Elliott Hughes
75f42d7ea7 Allow multiple (sequential) adb users on Linux.
Before this, adb will fail to start for the second user who tries because
/tmp/adb.log already exists and isn't writable by the second user.

Also allow $TMPDIR to override the use of /tmp.

Bug: http://b/29201686
Bug: https://code.google.com/p/android/issues/detail?id=211420

(cherry picked from commit d89a6c2285)

Change-Id: Ibb1369e8043feb9774593e317dcd7bb93323fd89
2016-06-08 08:36:19 -07:00
Sami Tolvanen
d6f5af35d5 Merge "fs_mgr: validate corrected signatures" into nyc-dev
am: eacbb824c9

* commit 'eacbb824c9ee2ccec9e1de641d03e7370888eabc':
  fs_mgr: validate corrected signatures

Change-Id: I3986a59d498a22769611216f5ed475f31332b2c9
2016-06-07 00:05:41 +00:00
Sami Tolvanen
eacbb824c9 Merge "fs_mgr: validate corrected signatures" into nyc-dev 2016-06-07 00:01:56 +00:00
Tao Bao
f9b7f7fdba Merge "Create /data/ota_package for OTA packages." into nyc-mr1-dev 2016-06-06 23:43:29 +00:00
David Pursell
f6d0da2b69 adbd: properly close subprocess pipes on Ctrl+C.
am: a6d5661140

* commit 'a6d56611404f2e1c0c9f4ab7c8471af0e80b2026':
  adbd: properly close subprocess pipes on Ctrl+C.

Change-Id: I96c1fb2036a58702b23f606bb1e6a27f924324eb
2016-06-06 23:18:58 +00:00
Sami Tolvanen
830126637a fs_mgr: validate corrected signatures
If signature verification fails and we have an error corrected
signature available, attempt to verify that instead.

Needs changes from
  Ie913c21ba1d07d6df4c6feeb7226b2ec963f4d19

Bug: 28943429
Change-Id: I7d48701916fe430b17aa05acb120f22a1802733d
2016-06-06 13:54:00 -07:00
David Pursell
a6d5661140 adbd: properly close subprocess pipes on Ctrl+C.
When non-interactive sessions exit via Ctrl+C, adbd sends SIGHUP
to the child process to let it know to exit. However, adbd was not
closing the pipes to the child process, so if the subprocess ignored
SIGHUP and continued writing it could fill up the pipe and block
forever while adbd waits for it to exit.

This CL adds the necessary calls to close the subprocess pipe after
sending SIGHUP.

Bug: 28981563
Change-Id: I318e322e563241052648361172f4859c297837fb
(cherry picked from commit f2aa186c7b)
2016-06-06 12:56:52 -07:00
Pablo Ceballos
c2efc32a0f Header changes for getFrameTimestamps
Change-Id: Iee9e0485544fac435e800ea869a8e4c2ed90bba9
2016-06-04 03:36:40 +00:00
Tao Bao
380d6b1b4d Create /data/ota_package for OTA packages.
We will store OTA packages there for both A/B and non-A/B OTAs. The
directory will be accessed by GMSCore (for both), uncrypt (non-A/B),
update_engine (A/B), update_verifier (A/B) and possibly system server
(for non-A/B OTAs to clean up half-way uncrypt'd packages).

Bug: 28944800
Change-Id: I5aa8156ec5052bd15dfadd4d8c28925d464e4401
2016-06-03 13:11:29 -07:00
Siqi Lin
e780adf0fe Revert "adb: close ep0 on disconnection."
am: 8c4076295e

* commit '8c4076295ebd867d276636d673b9f8e6a8df01a6':
  Revert "adb: close ep0 on disconnection."

Change-Id: I5b2e4b0aca3547a8cb69e8792e6599f2c79c631b
2016-06-03 04:46:23 +00:00
Lajos Molnar
276f382722 add android_flex_layout for describing all flexible formats.
Bug: 22767098
Bug: 24759202
Change-Id: I61e4ca9bd71e8da88a9571ec4effc7165026715b
2016-06-03 00:59:30 +00:00
Siqi Lin
8c4076295e Revert "adb: close ep0 on disconnection."
This reverts commit 69e97e4bee.

Bug: 28932120
Change-Id: I5e2569abed316c089886556c432bfe59bca08549
(cherry picked from commit 57de0514f0)
2016-06-02 17:30:43 -07:00
Calin Juravle
3a8434bf73 Merge "Add utility to prepare files in a similar way to directories" into nyc-dev
am: 6a29fe931d

* commit '6a29fe931d9fd3bf7f2aad3713dc70c080970763':
  Add utility to prepare files in a similar way to directories

Change-Id: I7516ecd90c2ba9025e58af184e83b61b5cad9341
2016-06-02 10:24:40 +00:00
Calin Juravle
6a29fe931d Merge "Add utility to prepare files in a similar way to directories" into nyc-dev 2016-06-02 10:10:37 +00:00
Daniel Micay
52ebee9865 add a property for controlling perf_event_paranoid
am: fe01f56c0d

* commit 'fe01f56c0d5c42508e1e82f5976e4c10bb00f632':
  add a property for controlling perf_event_paranoid

Change-Id: I1059ecb2c1d1aba95cd3c93f208ae7ca904cf95e
2016-06-02 02:05:20 +00:00
Daniel Micay
fe01f56c0d add a property for controlling perf_event_paranoid
(Cherry picked from commit 2b22a66382)

This adds a system property for controlling unprivileged access to
perf_event_paranoid. It depends on adding kernel support for
perf_event_paranoid=3 based on grsecurity's PERF_HARDEN feature to
completely disable unprivileged access to perf. A minimal port of this
feature is used in the vanilla Debian kernel by default.

It hides the non-hardened value as an implementation detail, since while
it is currently 1, it will probably become 2 in the future.

Bug: 29054680

Change-Id: I6e3ae3cf18d8c76df94f879c34fb6fde519b89a9
2016-06-01 16:58:48 -07:00
David Sehr
cdc503c13b add /data/misc/profman for output
am: 0eb24e1bc7

* commit '0eb24e1bc7317eb5764567223cdd9405d16aefa7':
  add /data/misc/profman for output

Change-Id: I8d8ebc0dc37aee1ac54f8e50e374cad77a6fe77a
2016-06-01 14:01:10 +00:00
David Sehr
0eb24e1bc7 add /data/misc/profman for output
Bug: 28748264
Change-Id: Ib57ccc570de446e03ea8c27ce8e404929138b213
2016-05-31 17:36:41 -07:00
Erik Kline
b927c6c39d Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev
am: 088f0e7c40

* commit '088f0e7c40a1cc66505f2bd73c54f3bab9908986':
  Add /vendor/xbin to the list of directories of executables

Change-Id: Ia48ba1bdab767ddd146aeb090c2c1a9bbc304e3d
2016-05-30 02:36:41 +00:00
Erik Kline
088f0e7c40 Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev 2016-05-30 02:31:46 +00:00
TreeHugger Robot
8024f8f9ea Merge "fs_mgr: update block device reference in verity metadata" into nyc-mr1-dev 2016-05-27 23:14:16 +00:00
Yurii Zubrytskyi
998496bc66 [adb] Followup CL to clean up adb_auth_host.cpp
am: 049ebb810f

* commit '049ebb810f466d916ec9e73cdf28624b57a8c25d':
  [adb] Followup CL to clean up adb_auth_host.cpp

Change-Id: Iaf8d2957478529a21edd6d4a502fc7354db40ba4
2016-05-27 19:36:41 +00:00
Yurii Zubrytskyi
204e3fa786 [adb] Issue the "auth" emulator command before any other one
am: a9e2b99a7f

* commit 'a9e2b99a7fdd31bcd6d852c6db26fe592236a24f':
  [adb] Issue the "auth" emulator command before any other one

Change-Id: I27e52100bd933e671adea1e8d03664fce855daaa
2016-05-27 17:38:35 +00:00
Paul Lawrence
4e898a01fd Make file encryption type available
Bug: 28905864
Change-Id: I5f59f824fd92c32ff87aa730dc5c0f250564c0a9
2016-05-27 09:38:29 -07:00
Erik Kline
a5a9c74f20 Add /vendor/xbin to the list of directories of executables
Bug: 28850734
Change-Id: Iaa14a463294d1f8a9c69328a273ce7f12a558bab
2016-05-27 17:37:53 +09:00
Yurii Zubrytskyi
049ebb810f [adb] Followup CL to clean up adb_auth_host.cpp
Get rid of unused includes + replace a fixed-size buffer with an
std::string

Change-Id: I4f9927b900a79a012b5d52908b9d22ac3d2a401c
2016-05-26 18:12:15 -07:00
Yurii Zubrytskyi
a9e2b99a7f [adb] Issue the "auth" emulator command before any other one
Emulator console now requires authentication; this means
'adb emu ...' commands silently fail because of it.
This CL adds an 'auth <token>' command to each user command,
making sure it won't be silently ignored.

Bug: https://code.google.com/p/android/issues/detail?id=211233
Change-Id: Id9ca4999fd2e6393cc88278eaf444243e13c0ec0
2016-05-26 18:11:59 -07:00
Siqi Lin
57de0514f0 Revert "adb: close ep0 on disconnection."
This reverts commit 69e97e4bee.

Bug: 28932120
Change-Id: I5e2569abed316c089886556c432bfe59bca08549
2016-05-26 17:25:32 -07:00
Jeremy Compostella
32cabf25aa fs_mgr: update block device reference in verity metadata
The dm-verity metadata contains the block device path that is given to
the dm-android-verity driver.  If the device is using slot A/B, this
path is missing the slot suffix.

This patch makes fs_mgr replace all the block device path reference
with the one including the active slot suffix.

Change-Id: Ib624d0d18b12a8a287cac7f15605a2e0fb7c97c6
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>

Bug: 28845874
2016-05-26 15:37:37 -07:00
Elliott Hughes
b598abf175 resolve merge conflicts of f0d4f38 to nyc-dev
am: 1265fd4934

* commit '1265fd493471b6e94cc4e9853d9307d7fde2fe98':
  Fix scanf %s in lsof.

Change-Id: I2e581b2dae519f77399a149d3de3c710cf629d29
2016-05-25 05:01:17 +00:00
Elliott Hughes
1265fd4934 resolve merge conflicts of f0d4f38 to nyc-dev
Change-Id: Ibce10a3c66560c10c67bd51f5b568552f43825f2
2016-05-24 17:22:51 -07:00
Elliott Hughes
f0d4f38773 resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee am: ad0c2bf5f3 am: a17f2802b1 am: 20b1e79563 am: c443a447b2
am: 5538f8bb63

* commit '5538f8bb63c79d1b9de6e809e085bd78b1027f9c':
  Fix scanf %s in lsof.

Change-Id: I09d37fb2798e6038bb00fb8e210b9d3c5348a4e4
2016-05-24 23:11:36 +00:00