Commit Graph

7495 Commits

Author SHA1 Message Date
Tao Bao 23cbb9a7de Merge "Use O_CLOEXEC at a few places." am: e3857ca43e am: 4e95d7503e
am: df2067d038

Change-Id: I92ca72988bb96ab0c17becc9d93d1ade30037c61
2019-03-01 16:22:07 -08:00
Tao Bao df2067d038 Merge "Use O_CLOEXEC at a few places." am: e3857ca43e
am: 4e95d7503e

Change-Id: Ic7a3d4af225abc0c21c76881b00efa7427ec2915
2019-03-01 16:18:06 -08:00
Tao Bao 4e95d7503e Merge "Use O_CLOEXEC at a few places."
am: e3857ca43e

Change-Id: If5b1622ca66d0722107bdac5daef1eda823cdf20
2019-03-01 16:14:07 -08:00
Treehugger Robot e3857ca43e Merge "Use O_CLOEXEC at a few places." 2019-03-02 00:04:26 +00:00
Tao Bao b549243b27 Use O_CLOEXEC at a few places.
Found these FDs unintentionally propagated into forked processes (e.g.
updater) during my local debugging. Use O_CLOEXEC to avoid that.

Test: Dump open FDs in updater process.
Test: Sideload a package on taimen (which uses framebuffer).
Test: Run graphics test on taimen.
Change-Id: I1fb65dd4a103c47d28b15973def9e9359c251ca3
2019-03-01 14:24:41 -08:00
Tao Bao b9cbb4d9e2 Merge "Use android::base::Pipe." am: 21cfc8b6f4 am: a04a7d89c2
am: 33bbeb40ce

Change-Id: Ifcbc4cd5923d82893c7428951955cb0cd4207a3a
2019-02-28 18:40:52 -08:00
Tao Bao 33bbeb40ce Merge "Use android::base::Pipe." am: 21cfc8b6f4
am: a04a7d89c2

Change-Id: Ibc0d9bc7766572901fa20a1d1acb8edd8f760a3c
2019-02-28 18:33:44 -08:00
Tao Bao a04a7d89c2 Merge "Use android::base::Pipe."
am: 21cfc8b6f4

Change-Id: Ic7c2cb62062710984fa3fbd5ed3c577cd84cd926
2019-02-28 18:29:35 -08:00
Treehugger Robot 21cfc8b6f4 Merge "Use android::base::Pipe." 2019-03-01 02:17:24 +00:00
Tao Bao 6fcd208db4 Use android::base::Pipe.
Also clean up the comments regarding updater/recovery protocol.

Test: Sideload a package on taimen. Check that /tmp/recovery.log
      contains the log from update_engine_sideload.
Test: Factory reset on taimen. Check that log file has the info from
      mke2fs.
Change-Id: If560269ce7007769fc85a63bd228813bdd75bebd
2019-02-28 15:53:28 -08:00
Zhomart Mukhamejanov 4be5562ae9 Merge "Updater updater_sample/README.md - build instructions." am: 52db3dc12e am: 2ee3614be3
am: 32bd2aa290

Change-Id: Ie988dd227283f3280466e7ad375ffc857ea6b679
2019-02-25 22:47:45 -08:00
Zhomart Mukhamejanov 32bd2aa290 Merge "Updater updater_sample/README.md - build instructions." am: 52db3dc12e
am: 2ee3614be3

Change-Id: I0849351afb0796f430b71263c250b2e721f665fd
2019-02-25 22:32:42 -08:00
Zhomart Mukhamejanov 2ee3614be3 Merge "Updater updater_sample/README.md - build instructions."
am: 52db3dc12e

Change-Id: I71784d07fc6952377c5a06116f2aa0850d613ee3
2019-02-25 20:57:58 -08:00
Zhomart Mukhamejanov 52db3dc12e Merge "Updater updater_sample/README.md - build instructions." 2019-02-26 04:00:52 +00:00
Zhomart Mukhamejanov 011b5bbc06 Updater updater_sample/README.md - build instructions.
Change-Id: Icbd577e3ceeec2766eca690b529b31f562df6fb2
Test: docs only
2019-02-25 16:19:55 -08:00
Xin Li 965e5dafd3 Merge stage-aosp-master into pi-dev-plus-aosp
am: 3574ac5cff

Change-Id: I526e1ec56871d4b132578591e27477dbe17656d5
2019-02-25 05:05:27 -08:00
Xin Li 3574ac5cff Merge stage-aosp-master into pi-dev-plus-aosp
Bug: 126125118
Change-Id: Ib376a93e85883804b7b75085a21683452e1609d3
2019-02-25 00:27:11 -08:00
Xin Li d429ddca6b Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master 2019-02-21 07:04:42 +00:00
David Anderson fc9c0f4644 Merge "Add a logo to the fastbootd screen." am: d294935bf7 am: dbefca86b8
am: 2fc243eef3

Change-Id: I420b2e143058a954f4238ea360fefea7edd70e69
2019-02-20 20:26:03 -08:00
David Anderson 2fc243eef3 Merge "Add a logo to the fastbootd screen." am: d294935bf7
am: dbefca86b8

Change-Id: I5068b33ee54aa847356ef167122953d16e735e43
2019-02-20 20:22:05 -08:00
David Anderson dbefca86b8 Merge "Add a logo to the fastbootd screen."
am: d294935bf7

Change-Id: I1cbd17fbd7636c1e5779b376c01984e9986bbcec
2019-02-20 20:18:05 -08:00
David Anderson d294935bf7 Merge "Add a logo to the fastbootd screen." 2019-02-21 04:07:29 +00:00
Xin Li 6b72e3f03b DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I4ac749387dca39a09e96ea5588b651d06728033b
2019-02-20 16:17:20 -08:00
Bill Yi 0d853ddffd [automerger skipped] Import translations. DO NOT MERGE am: fc8af23e97 -s ours
am: c3f22a4c2d -s ours
am skip reason: subject contains skip directive

Change-Id: I260e894a14bd59a487d3a9fd7468462994b9a379
2019-02-16 12:17:03 -08:00
Bill Yi c3f22a4c2d [automerger skipped] Import translations. DO NOT MERGE
am: fc8af23e97 -s ours
am skip reason: subject contains skip directive

Change-Id: I4ff4a94f634207aa24c72788a755565798782cba
2019-02-16 12:12:05 -08:00
Bill Yi fc8af23e97 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie357c8e7a6445223a5a657cd0e96ded4689837f6
2019-02-16 01:07:42 -08:00
David Anderson 983e2d5718 Add a logo to the fastbootd screen.
fastbootd looks too much like recovery, even if you're carefully reading
the menu. It's not obvious the device is in a flashing mode, and it's
too tempting to reboot or unplug the device in this state.

As a first step, this patch adds a big red "fastbootd" logo so it's less
obviously in recovery mode.

Bug: 120429730
Test: manual test
Change-Id: I73359f1fdfdc0b1694993f760fe7f35c5713b24e
2019-02-11 19:22:03 -08:00
Xin Li 96a0f6e570 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: c98e5d4ad1 -s ours
am: da85ed8792 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie3e4bede38b669db2aefb24e34ba593b2862b28c
2019-02-11 19:07:13 -08:00
Xin Li da85ed8792 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
am: c98e5d4ad1 -s ours
am skip reason: subject contains skip directive

Change-Id: I77aa5aa57eadffe193c21a6890749f674d38c08e
2019-02-11 18:09:39 -08:00
Xin Li c98e5d4ad1 DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Bug: 124234733
Change-Id: Ice617995cbe56d367124b3a3420a2caad300acb1
2019-02-11 15:54:16 -08:00
android-build-team Robot 96f7786965 Snap for 5180536 from 8b508c984d to pi-platform-release
Change-Id: I18ffadbdab03199e33f4476135b95da658880541
2019-02-09 02:15:09 +00:00
Daniel Rosenberg fb064e7e38 Merge "Defer marking boot successful when checkpointing" am: 90edbb17f8 am: 5837eba8ed
am: a3c1e2052b

Change-Id: Ifdc7aa92131389e0ec2eb89aef42934016c68fce
2019-02-07 18:18:48 -08:00
Daniel Rosenberg a3c1e2052b Merge "Defer marking boot successful when checkpointing" am: 90edbb17f8
am: 5837eba8ed

Change-Id: I77b54d6328634b284c930a756b2dd324c2b3a493
2019-02-07 18:01:42 -08:00
Daniel Rosenberg 5837eba8ed Merge "Defer marking boot successful when checkpointing"
am: 90edbb17f8

Change-Id: Ic211f79ddd70dd4dcf6c7de7336d5ec98f7b46d6
2019-02-07 17:49:46 -08:00
Daniel Rosenberg 90edbb17f8 Merge "Defer marking boot successful when checkpointing" 2019-02-08 01:40:54 +00:00
Daniel Rosenberg 15f22bddfb Defer marking boot successful when checkpointing
This moves actually marking the slot as successful to a later point
so that on devices with checkpointing enabled we can still roll back to
the previous version if we fail to boot to the point that the checkpoint
is marked as successful.

Test: When taking an update on a checkpoint enabled device, it
      defers marking the slot as successful instead of directly
      marking it. Visible in logs.
Bug: 123260515

Change-Id: I7ed3595c1b0904ddbfe20d1cad4f69ecbf1ea351
2019-02-07 13:26:05 -08:00
Tianjie Xu 61fd028079 Merge "Recovery test: Fix an parameter issue in string construction" am: e13b39bbb1 am: 644e290d2d
am: 6c69b7515d

Change-Id: Ib00193bc8c98a365f345eb858ff7220d72dcc7d9
2019-02-05 17:15:15 -08:00
Tianjie Xu 6c69b7515d Merge "Recovery test: Fix an parameter issue in string construction" am: e13b39bbb1
am: 644e290d2d

Change-Id: Ib79a95d6a727ff9eb7af56ef9b6cda69c5f1dd99
2019-02-05 17:11:14 -08:00
Tianjie Xu 644e290d2d Merge "Recovery test: Fix an parameter issue in string construction"
am: e13b39bbb1

Change-Id: I4cafef20f443adc11776587028b176dfcb75becd
2019-02-05 17:07:13 -08:00
Tianjie Xu e13b39bbb1 Merge "Recovery test: Fix an parameter issue in string construction" 2019-02-06 00:53:25 +00:00
xunchang 7b08a5a6eb Recovery test: Fix an parameter issue in string construction
The intended string constructor is supposed be
basic_string(size_type count, CharT ch). But the parameter is
accidentally reversed when calling the constructor in install_test.

Test: A failed unit test pass
Change-Id: Id9765bfa7d2368ff0d7fbeea45c9c8357864e060
2019-02-05 12:44:53 -08:00
Bill Yi 25bfb1bea9 Import translations. DO NOT MERGE
Change-Id: Id46b7b2d7bf8f9fe1edd9bb90cc0e3d279f3472c
Auto-generated-cl: translation import
2019-02-01 21:22:54 -08:00
Tom Cherry 0be4406e3c Merge "Add android::fs_mgr namespace for new Fstab code" am: 990807a95f am: 9594188eea
am: 5217b136a6

Change-Id: I3e79fc9c02a1fa39c8502df587619a6a47334559
2019-01-31 12:22:29 -08:00
Tom Cherry 5217b136a6 Merge "Add android::fs_mgr namespace for new Fstab code" am: 990807a95f
am: 9594188eea

Change-Id: I2e51f997a0c362fa93ac1990b05fda86bf063522
2019-01-31 12:05:27 -08:00
Tom Cherry 9594188eea Merge "Add android::fs_mgr namespace for new Fstab code"
am: 990807a95f

Change-Id: I215dd9dd7336953f65abbde5a0b8ef47b6407326
2019-01-31 11:50:09 -08:00
Tom Cherry 990807a95f Merge "Add android::fs_mgr namespace for new Fstab code" 2019-01-31 19:35:54 +00:00
Tom Cherry 72a114a3e1 Add android::fs_mgr namespace for new Fstab code
Also add libfstab dependencies where needed.  Previously the
`typedef struct FstabEntry Volume;` line served to both define a
`struct FstabEntry` as well as alias Volume to it.  With the new
namespace for android::fs_mgr::FstabEntry, `struct FstabEntry` isn't
compatible anymore, so we need to alias Volume to the real
android::fs_mgr::FstabEntry.

In doing so, we need to include <fstab/fstab.h> and this requires
libfstab as a library, which a few modules did not have before.

Test: treehugger
Change-Id: I655209a0efb304b3e0568db0748bd5cf7cecbdb7
2019-01-31 09:00:40 -08:00
Tianjie Xu 89b92c1217 Merge "Fix potential size overflow in blockimg.cpp" am: 9a54dd3bf9 am: cc025b2b4a
am: d8063b0af4

Change-Id: I2c8fd5c1984f20157e8cbda07b476d0d6de458d7
2019-01-29 16:07:52 -08:00
Tianjie Xu d8063b0af4 Merge "Fix potential size overflow in blockimg.cpp" am: 9a54dd3bf9
am: cc025b2b4a

Change-Id: Iba39c6bd6e4e0b4e0576f7b82662439794b1d2fc
2019-01-29 15:52:19 -08:00
Tianjie Xu cc025b2b4a Merge "Fix potential size overflow in blockimg.cpp"
am: 9a54dd3bf9

Change-Id: I0b19ace59a023380c2db175123f93205e3405aee
2019-01-29 15:33:54 -08:00