PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,853 Commits 1 Branch 0 Tags
ce1bfd3440bda1eba5c11fbfa594148ae9c06da3
Commit Graph

7853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao ce1bfd3440 Merge "Revert "recovery: report compliant reboot reason"" am: 44f6b182dd am: b491496fc3 am: 863c8f36dd 
am: 7c151865d6

Change-Id: Ie43cba23d466d7e8ca403c349e20b602fe7cba09
 2019-05-23 17:33:12 -07:00
Tao Bao 7c151865d6 Merge "Revert "recovery: report compliant reboot reason"" am: 44f6b182dd am: b491496fc3 
am: 863c8f36dd

Change-Id: Ic736642d61adb472aa1b4984cc8e335f5c8d7207
 2019-05-23 01:09:20 -07:00
Tao Bao 863c8f36dd Merge "Revert "recovery: report compliant reboot reason"" am: 44f6b182dd 
am: b491496fc3

Change-Id: Ib108dd6d1bbda2f03a3730c58519e42b5dd59766
 2019-05-22 21:18:45 -07:00
Tao Bao b491496fc3 Merge "Revert "recovery: report compliant reboot reason"" 
am: 44f6b182dd

Change-Id: I37bfc2cac926a3b3aaecad4807478e5aed9f51aa
 2019-05-22 18:52:21 -07:00
Treehugger Robot 44f6b182dd Merge "Revert "recovery: report compliant reboot reason"" 2019-05-22 21:55:38 +00:00
Tao Bao feefbf2f56 Revert "recovery: report compliant reboot reason" 
This reverts commit 6f4e4db4f9.

Reason for revert: Booting out of recovery (choose `Reboot system now`)
on taimen is broken. Device keeps booting back into recovery.

Bug: 133326470
Test: Choose `Reboot system now` from recovery menu. Deivce attempts
      normal boot.
Change-Id: I6e85fc248e18953a6fb94513c3abc7e7e0fb0477
 2019-05-22 11:06:26 -07:00
Mark Salyzyn 0f677e6d96 Merge "recovery: report compliant reboot reason" am: d31fb2e7fc am: c3042973a4 am: d77641069e 
am: c812d98b64

Change-Id: Ib0a60bcc1d48baa811f1e08e0d7f3e86a3ed3197
 2019-05-21 21:35:03 -07:00
Tianjie Xu 3a961fa48c Merge "Add UpdaterRuntime class" am: e7b3c5698e am: c6d7065880 am: 3445bf5352 
am: cba91383f7

Change-Id: I44cc8652020bccd896e481f52aa439277206c87c
 2019-05-21 17:54:23 -07:00
Mark Salyzyn c812d98b64 Merge "recovery: report compliant reboot reason" am: d31fb2e7fc am: c3042973a4 
am: d77641069e

Change-Id: I1a5afef9ce6ff46cbf89d458e1ec52d916da630c
 2019-05-21 15:59:34 -07:00
Tianjie Xu cba91383f7 Merge "Add UpdaterRuntime class" am: e7b3c5698e am: c6d7065880 
am: 3445bf5352

Change-Id: Iee5015a8c6c6c86c6a3dd5516cc48afd02c7874d
 2019-05-21 15:55:25 -07:00
Mark Salyzyn d77641069e Merge "recovery: report compliant reboot reason" am: d31fb2e7fc 
am: c3042973a4

Change-Id: I020798a035fa83839347f821dbfad1d363ec5d69
 2019-05-21 13:32:30 -07:00
Tianjie Xu 3445bf5352 Merge "Add UpdaterRuntime class" am: e7b3c5698e 
am: c6d7065880

Change-Id: I4096ef9a51904b5ecd889bda5ff0d9e11acb4071
 2019-05-21 13:25:31 -07:00
Mark Salyzyn c3042973a4 Merge "recovery: report compliant reboot reason" 
am: d31fb2e7fc

Change-Id: I7105c56c65f8d2573ec8e0b7cada81468ccef2b7
 2019-05-21 11:57:57 -07:00
Tianjie Xu c6d7065880 Merge "Add UpdaterRuntime class" 
am: e7b3c5698e

Change-Id: I2942823be107f1e693385a7892251519ac50afb1
 2019-05-21 11:57:32 -07:00
Mark Salyzyn d31fb2e7fc Merge "recovery: report compliant reboot reason" 2019-05-21 17:44:14 +00:00
Tianjie Xu e7b3c5698e Merge "Add UpdaterRuntime class" 2019-05-21 17:07:30 +00:00
Tao Bao 1af77fdc6e Merge "Add misc_writer." am: 962f7e0c0c am: f9fb4878fc am: 70bc3c40d2 
am: 8ab684adca

Change-Id: Ie07b2920cd1b0d9011bc918c780db5909a786a8b
 2019-05-21 07:52:50 -07:00
Tao Bao 8ab684adca Merge "Add misc_writer." am: 962f7e0c0c am: f9fb4878fc 
am: 70bc3c40d2

Change-Id: I505ef030e614eda2bac7f8baa12acc92b22e9142
 2019-05-21 07:01:33 -07:00
Tao Bao 70bc3c40d2 Merge "Add misc_writer." am: 962f7e0c0c 
am: f9fb4878fc

Change-Id: Icb9af8d6b74a958b0979e4d53426e3f9eaf01e50
 2019-05-21 06:56:31 -07:00
Tao Bao f9fb4878fc Merge "Add misc_writer." 
am: 962f7e0c0c

Change-Id: I5b007e3c880c7f6100e95c57ee02b2fd8e3d6c6d
 2019-05-21 06:51:28 -07:00
Tao Bao 962f7e0c0c Merge "Add misc_writer." 2019-05-21 13:41:07 +00:00
Tianjie Xu 1536db887f Add UpdaterRuntime class 
This class adds a wrapper to the runtime dependent functions. Therefore,
the behavior of update on device stays the same, while simulators can
have their own implementations. Also change the caller side of the
registered updater functions to call these runtime wrappers.

Bug: 131911365
Test: unit tests pass, sideload an update on cuttlefish
Change-Id: Ib3ab67132991d67fc132f27120e4152439d16ac5
 2019-05-20 18:03:27 -07:00
Tao Bao 7ae0169842 Add misc_writer. 
bootloader_message.h currently divides /misc into four segments. The
space between 2K and 16K is reserved for vendor use (e.g. bootloader
persists flags). This CL adds a vendor tool "misc_writer", to allow
writing data to the vendor space in /misc, before getting a dedicated
HAL for accessing /misc partition (b/131775112).

Targets need to explicitly include the module, then invoke the
executable to write data. For example, the following command will write
3-byte data ("0xABCDEF") to offset 4 in vendor space (i.e. 2048 + 4 in
/misc).
$ /vendor/bin/misc_writer --vendor-space-offset 4 --hex-string 0xABCDEF

Bug: 132906936
Test: Run recovery_unit_test on crosshatch.
Test: Call the command via init.hardware.rc on crosshatch. Check that
      the call finishes successfully. Then check the contents written to
      /misc (`dd bs=1 skip=2048 if=/dev/block/sda2 count=32 | xxd`).
Change-Id: I79548fc63fc79b705a0320868690569c3106949f
 2019-05-20 15:51:26 -07:00
Mark Salyzyn 6f4e4db4f9 recovery: report compliant reboot reason 
shutdown and reboot should have a corresponding sub-reason.

Adding:
    "reboot,fastboot_menu"
    "reboot,recovery_menu"
    "reboot,recovery_ui"
    "shutdown,fastboot"
    "shutdown,recovery"
    "reboot,unknown#"

Test: none
Change-Id: Icf1ab0d462ec2de2272914a36994a095998d6186
 2019-05-20 13:52:10 -07:00
Xin Li fa88c950af [automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master am: e7a0262c14 -s ours am: ec3d4af4b6 
am: 619f571114 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibd357e1ea836c9c6c8026589eb5e5b3149319fc4
 2019-05-16 10:12:01 -07:00
Xin Li 619f571114 [automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master am: e7a0262c14 -s ours 
am: ec3d4af4b6

Change-Id: I1c3e43d0ee3120a84c068ec35447db3e73cb7a0e
 2019-05-16 02:24:20 -07:00
Xin Li ec3d4af4b6 [automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master 
am: e7a0262c14 -s ours
am skip reason: subject contains skip directive

Change-Id: I8100929a2f3a752875be6ef98080174c7fb68dae
 2019-05-15 17:25:30 -07:00
Xin Li e7a0262c14 DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master 
Bug: 132622481
Change-Id: Ic07faa9aa968d11ae8f6b44d548d724fd194e047
 2019-05-13 15:56:57 -07:00
Tao Bao 8ffec8944c Merge "roots: Remove get_system_root and logical_partitions_mapped." am: ba8f38d741 am: c53856dca7 
am: fb4f72cb7c

Change-Id: Ib4c2cc6f5f90f1ee59461d52f43a6fcb035bcf03
 2019-05-10 21:12:19 -07:00
Tao Bao fb4f72cb7c Merge "roots: Remove get_system_root and logical_partitions_mapped." am: ba8f38d741 
am: c53856dca7

Change-Id: Ia77b93802de465219587a519d1109aab888c38f0
 2019-05-10 18:08:37 -07:00
Tao Bao c53856dca7 Merge "roots: Remove get_system_root and logical_partitions_mapped." 
am: ba8f38d741

Change-Id: I7bc0a5ff9e7709f91fe28f4c9b8d20f5c8d20cf8
 2019-05-10 17:40:31 -07:00
Tao Bao ba8f38d741 Merge "roots: Remove get_system_root and logical_partitions_mapped." 2019-05-10 23:58:32 +00:00
Tao Bao f90d9a102f roots: Remove get_system_root and logical_partitions_mapped. 
Test: TreeHugger
Test: Boot into recovery on blueline. Choose "Mount system partition".
Change-Id: Iac475d18ce2415de09dc0bf009ad4cf0383ffede
 2019-05-10 10:42:56 -07:00
TreeHugger Robot 9848f117d7 Merge "Import translations. DO NOT MERGE" 2019-05-10 08:26:56 +00:00
Xin Li a61c8f2e83 [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 343a7dcdd2 -s ours am: 8e7be1faeb -s ours 
am: 4904e5f06a -s ours
am skip reason: subject contains skip directive

Change-Id: Ib2a71a935ca0a44753331f8778809426fc764b76
 2019-05-09 21:22:10 -07:00
Elliott Hughes f8053c5857 Merge "Track libziparchive API change." am: 6da27adb0b am: 46fa74623a 
am: 774a79492a

Change-Id: I8c678857bd4fa6d9a5b227a3931bf919f1896172
 2019-05-09 19:22:14 -07:00
Tianjie Xu 4161a635ce Merge "Skip hashtree computation during block image verify" am: c046a61d97 am: e945763a5d 
am: 8876c2d4ab

Change-Id: I3647cd9b5d6e15473778ce3ac7e8c525f8e58ebc
 2019-05-09 17:45:33 -07:00
Bill Yi 84efc1ba7d Import translations. DO NOT MERGE 
Change-Id: Ia35cdac295a1ce6f8b53638c908c0caf2a97477c
Auto-generated-cl: translation import
 2019-05-09 17:26:20 -07:00
Xin Li 4904e5f06a [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 343a7dcdd2 -s ours 
am: 8e7be1faeb -s ours
am skip reason: subject contains skip directive

Change-Id: I3c51185cacadca80cfa183ec16b73426c7b9e936
 2019-05-09 17:11:52 -07:00
Elliott Hughes 774a79492a Merge "Track libziparchive API change." am: 6da27adb0b 
am: 46fa74623a

Change-Id: I1108099bc7dc4f20856fb611eb2552592ceff759
 2019-05-09 16:18:32 -07:00
Tianjie Xu 8876c2d4ab Merge "Skip hashtree computation during block image verify" am: c046a61d97 
am: e945763a5d

Change-Id: Ic732927e67fee9abab74e9ca2df2bbf271228c9e
 2019-05-09 16:15:36 -07:00
Xin Li 8e7be1faeb [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." 
am: 343a7dcdd2 -s ours
am skip reason: subject contains skip directive

Change-Id: Iea7679752ae74ce0d026fe3e58d3d3df88b21739
 2019-05-09 15:48:46 -07:00
Xin Li 343a7dcdd2 Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." 2019-05-09 22:05:46 +00:00
Elliott Hughes 46fa74623a Merge "Track libziparchive API change." 
am: 6da27adb0b

Change-Id: Ib261d224fe4b57ead972987466dc30411505aa30
 2019-05-09 14:46:26 -07:00
Tianjie Xu e945763a5d Merge "Skip hashtree computation during block image verify" 
am: c046a61d97

Change-Id: If5934f92768248c79029c3e7e0934b7a2a37c88d
 2019-05-09 14:43:49 -07:00
Elliott Hughes 6da27adb0b Merge "Track libziparchive API change." 2019-05-09 21:32:52 +00:00
Tianjie Xu cac54eaba5 Merge "Add Updater class and remove UpdaterInfo" am: 19737a5b38 am: 93667742fe 
am: 58c716601e

Change-Id: Ic38dfed8c169516bc0f30acbdf9971b683fea044
 2019-05-09 14:06:16 -07:00
Tianjie Xu c046a61d97 Merge "Skip hashtree computation during block image verify" 2019-05-09 20:47:57 +00:00
Tianjie Xu 58c716601e Merge "Add Updater class and remove UpdaterInfo" am: 19737a5b38 
am: 93667742fe

Change-Id: I80f09705d083e4566ec4b60ebcf0ef711fe48845
 2019-05-09 11:08:05 -07:00
Tianjie Xu 3fda5d6508 Skip hashtree computation during block image verify 
The hashtree computation is designed to execute after we write all the
bytes to the target block device. And executing the command during block
image verify will almost always fail since we are still on the source
build.

Test: run simulator
Change-Id: If8ebb66739969520367a0815f5f8f89f6fae47cf
 2019-05-09 10:58:10 -07:00