Commit Graph

7159 Commits

Author SHA1 Message Date
Treehugger Robot 9c675b0964 Merge "Show 'Enter Fastboot' menu item only if device supports fastbootd" 2018-09-19 04:26:31 +00:00
Hridya Valsaraju daa301e3bd Show 'Enter Fastboot' menu item only if device supports fastbootd
Bug: 112664456
Test: Manual, 'Enter Fastboot' option not visible.
Change-Id: I2642391a69a11cd0496c1287130b3b0291c93232
2018-09-18 14:53:31 -07:00
Tao Bao d48a4c128a Merge "Trigger the logging when prompting for wipe." am: 49dc0fed26 am: cda59a70f2
am: ad5d337832

Change-Id: I3f672481bb1057153bc35c3b9c472972f2c35e34
2018-09-17 16:38:10 -07:00
Tao Bao ad5d337832 Merge "Trigger the logging when prompting for wipe." am: 49dc0fed26
am: cda59a70f2

Change-Id: I7100220f3cafd6f7fb0865388e496796606c5372
2018-09-17 16:32:00 -07:00
Tao Bao cda59a70f2 Merge "Trigger the logging when prompting for wipe."
am: 49dc0fed26

Change-Id: Icdd186331061e68b9c06222b6dafd25e2487dd77
2018-09-17 16:27:58 -07:00
Treehugger Robot 49dc0fed26 Merge "Trigger the logging when prompting for wipe." 2018-09-17 23:18:16 +00:00
Tao Bao a5bbcb9596 Trigger the logging when prompting for wipe.
This allows recording the reason string that prompts user for a data
wipe, even if user selects 'Try again'.

Test: Inject an error into framework to trigger RescueParty. Select
      'Try again' and check the recovery log post-boot.
Change-Id: I0d7d5afcf38cae5019e2ce0a46d3cd1ac3e83a03
2018-09-17 14:37:27 -07:00
Tianjie Xu 2b1a464a70 Move the parse of last_install to recovery-persist
The recovery-persist used to look for the related recovery logs in
persist storage, and copy them under /data/misc/recovery during the
normal boot process.

As we also want to find out the sideload information from last_install,
it makes more sense to move the parse & report of non-a/b metrics to
recovery-persist. Thus we can avoid the race condition of the file
system between the native code and RecoverySystem.

Bug: 114278989
Test: unit test pass, check the event buffer for metrics report
Change-Id: I32d7b2b831bc74a61a70af9a2f0b8a7e9b3e36ee
2018-09-13 13:27:55 -07:00
Hridya Valsaraju 3d82f2ee23 Merge "Allow switch to fastbootd when userdata wipe is required" am: 16147d1bd6 am: 20b29bbbbd
am: 165478c774

Change-Id: Id8998826195d7433d4ef8389b08c7017279db014
2018-09-12 18:20:13 -07:00
Hridya Valsaraju 165478c774 Merge "Allow switch to fastbootd when userdata wipe is required" am: 16147d1bd6
am: 20b29bbbbd

Change-Id: Ibbf99302158a72b4f8170bb8fe3fc30db4b78cda
2018-09-12 18:06:03 -07:00
Hridya Valsaraju 20b29bbbbd Merge "Allow switch to fastbootd when userdata wipe is required"
am: 16147d1bd6

Change-Id: I475f0f48b4deab9c858fb7e5bd699e94d9a1b89e
2018-09-12 18:00:58 -07:00
Treehugger Robot 16147d1bd6 Merge "Allow switch to fastbootd when userdata wipe is required" 2018-09-13 00:48:42 +00:00
Hridya Valsaraju eb6f13aeb6 Allow switch to fastbootd when userdata wipe is required
Bug: 114065789
Test: Able to use 'adb reboot fastboot' to switch to fastboot
from recovery when a userdata wipe is required to boot.

Change-Id: Ice6950444656f8d8857808531af030078f544b88
2018-09-12 14:16:07 -07:00
Devin Kim 29472c7566 uncrypt: fix ioctl direction for F2FS_IOC_GET_PIN_FILE
The direction should be set as READ, not WRITE

Change-Id: Id695276f25c1d75bca3a02d87e4a59623e95cb00
2018-09-12 09:55:33 -07:00
Tao Bao 466f59f7c1 Merge "minui: Track the name change to minui related properties." am: da46f9067a am: 3d95692b5e
am: bdc7b7e071

Change-Id: I5571bf07a2c8cc41555c11330951526cc7b603db
2018-09-11 14:56:39 -07:00
Tao Bao bdc7b7e071 Merge "minui: Track the name change to minui related properties." am: da46f9067a
am: 3d95692b5e

Change-Id: Ia9e4b7adad2fb8000cb465f51ddee6bc7d756299
2018-09-11 14:52:39 -07:00
Tao Bao 3d95692b5e Merge "minui: Track the name change to minui related properties."
am: da46f9067a

Change-Id: I967f2b14dcfe10dfa7d09492758bfe2e907374e5
2018-09-11 14:47:35 -07:00
Tao Bao da46f9067a Merge "minui: Track the name change to minui related properties." 2018-09-11 21:33:01 +00:00
Hridya Valsaraju 09ff9796f5 Merge "Fix sideload for user devices by adding a new sideload config" am: 1254e15e50 am: 94e5553f4e
am: fae21617f9

Change-Id: Ida5540b8e9279ccb717c6efc5d4019ac627789a3
2018-09-09 15:46:49 -07:00
Hridya Valsaraju fae21617f9 Merge "Fix sideload for user devices by adding a new sideload config" am: 1254e15e50
am: 94e5553f4e

Change-Id: Ie49bc69638727d1a965af3cbeb8ed03102fd3019
2018-09-09 15:42:25 -07:00
Hridya Valsaraju 94e5553f4e Merge "Fix sideload for user devices by adding a new sideload config"
am: 1254e15e50

Change-Id: Ib17a58895763d6440dc0e8f7390e9048345aa10b
2018-09-09 15:38:01 -07:00
Treehugger Robot 1254e15e50 Merge "Fix sideload for user devices by adding a new sideload config" 2018-09-09 22:23:25 +00:00
Android Build Merger (Role) 62497b2c80 [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: f39f139103 skipped: cce521e439 skipped: 4a53559e98
Change-Id: I4299e6a86c1006f2545f925da4552be7fda75f32
2018-09-07 23:15:41 +00:00
Android Build Merger (Role) 4a53559e98 [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: f39f139103 skipped: cce521e439
Change-Id: I7e60856514769442397e0055e2edae73e9b92cee
2018-09-07 23:15:39 +00:00
Android Build Merger (Role) cce521e439 [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: f39f139103
Change-Id: Ibe1a269dbc52c6106161ccd757434a131fb5c4a2
2018-09-07 23:15:38 +00:00
Tianjie Xu f39f139103 DO NOT MERGE: Initialize the ZipArchive to zero before parsing
The fields of the ZipArchive on the stack are not initialized before we
call libminzip to parse the zip file. As a result, some random memory
location is freed unintentionally when we close the ZipArchive upon
parsing failures.

Bug: 35385357
Test: recompile and run the poc with asan.
Change-Id: I7e7f8ab4816c84a158af7389e1a889f8fc65f079
2018-09-07 16:14:57 -07:00
Android Build Merger (Role) 35332d7c62 [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb
Change-Id: I2239a4b3dea1a167ed7cd7ceaeaf42a3caa2189f
2018-09-07 23:13:14 +00:00
Android Build Merger (Role) bc42a6b0eb [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce
Change-Id: I3f11a59a38c2604970d2a2a2d5795a15b0f07100
2018-09-07 23:13:13 +00:00
Android Build Merger (Role) 98acdb9fce [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16
Change-Id: Ieb67174f2b98361f82ebc6c76b18bb904d44ea99
2018-09-07 23:13:11 +00:00
Android Build Merger (Role) 9216bccd16 [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412
Change-Id: I7efba2ee6798c5fb71679bee7861d98f3643f414
2018-09-07 23:13:10 +00:00
Android Build Merger (Role) 244aba4412 [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351
Change-Id: I7e1da775a32b1f5ef72a2d95b94c0bf494251781
2018-09-07 23:13:09 +00:00
Tianjie Xu e830a51351 DO NOT MERGE: Initialize the ZipArchive to zero before parsing
The fields of the ZipArchive on the stack are not initialized before we
call libminzip to parse the zip file. As a result, some random memory
location is freed unintentionally when we close the ZipArchive upon
parsing failures.

Bug: 35385357
Test: recompile and run the poc with asan.
Change-Id: I7e7f8ab4816c84a158af7389e1a889f8fc65f079
2018-09-07 16:09:28 -07:00
Hridya Valsaraju e4ef453914 Fix sideload for user devices by adding a new sideload config
Bug: 113563995
Test: Tested the 'adb sideload' command on marlin user/userdebug builds
and walleye user/userdebug builds

Change-Id: I00d565547b85f2db87012e4a08316609e03395ac
2018-09-07 15:02:43 -07:00
Tao Bao cf4d9c711b Merge "Remove res-560dpi symlink." am: 02986d381e am: 75dd6f652d
am: 19c17b101e

Change-Id: Iadbfe042a85237ce827464a8c83c49899729d10b
2018-09-06 13:32:15 -07:00
Tao Bao 19c17b101e Merge "Remove res-560dpi symlink." am: 02986d381e
am: 75dd6f652d

Change-Id: I5df14b63a50b1f2baa8c3442c89e5e47c038b8fa
2018-09-06 13:05:50 -07:00
Tao Bao 75dd6f652d Merge "Remove res-560dpi symlink."
am: 02986d381e

Change-Id: I4342fb3dcb5e50be1996b06d1eaf6aa50afc3a00
2018-09-06 12:58:09 -07:00
Tao Bao 02986d381e Merge "Remove res-560dpi symlink." 2018-09-06 19:29:37 +00:00
Tao Bao 52b6ecab37 Remove res-560dpi symlink.
The change to platform/build in [1] added support for mapping numeric
DPIs to a proper density bucket. As a result, 560dpi gets mapped to
xxxhdpi automatically. This CL removes the previous workaround.

[1] https://android-review.googlesource.com/c/platform/build/+/741666

Bug: 111559919
Test: Build recovery image for marlin. Verify that it picks up xxxhdpi
      recovery resources.
Test: Boot into recovery. Run graphics test.
Change-Id: I65fefc7e2ba90b347e0ad283139429266d77c3b4
2018-09-05 21:55:25 -07:00
Tao Bao 050feb0153 minui: Track the name change to minui related properties.
These properties need to be exposed to both of charger and recovery.
This CL tracks the name change.

Bug: 113567255
Test: Build along with other CLs in the topic (for Makefile and
      sepolicy changes). Boot into charger mode.
Test: Boot into recovery. Run graphics test.
Change-Id: I4d90778c1767c9bd7e00830a34ee2d4875ce0b83
2018-09-05 21:47:19 -07:00
Tao Bao 884b1a5b0c Merge "support mounting f2fs in recovery mode" am: a062fae9d7 am: 15e957d3f6
am: 6b4a2c4553

Change-Id: I0276732b6acd77541172d612587abba9222ab484
2018-09-04 10:40:53 -07:00
Tao Bao 6b4a2c4553 Merge "support mounting f2fs in recovery mode" am: a062fae9d7
am: 15e957d3f6

Change-Id: I53bd70ae87fc69ae82dfbefe48fa42d60ef438eb
2018-09-04 10:28:45 -07:00
Tao Bao 15e957d3f6 Merge "support mounting f2fs in recovery mode"
am: a062fae9d7

Change-Id: I5f9798c1d901e98240831297aadadf39158cf2fc
2018-09-04 10:19:35 -07:00
Tao Bao a062fae9d7 Merge "support mounting f2fs in recovery mode" 2018-09-04 16:59:39 +00:00
Lianjun Huang 5d7be6b4a5 support mounting f2fs in recovery mode
Change-Id: Ic03b3e95c4b5cd49b92cb3ec697e327a59421549
Signed-off-by: Lianjun Huang <huanglianjun@vivo.com>
2018-09-03 15:37:00 +00:00
Tao Bao 4ca55f202e Merge "applypatch: {Load,Save}FileContents return bool values." am: bae5f1a846 am: baa841ed04
am: 15651fd8f0

Change-Id: I75f199f8bcbc027b09c20d47bad41f2813f705c1
2018-09-01 09:28:35 -07:00
Tao Bao 15651fd8f0 Merge "applypatch: {Load,Save}FileContents return bool values." am: bae5f1a846
am: baa841ed04

Change-Id: Id2f21c231c57001b10d48472eea33d7d15ed8631
2018-09-01 09:24:14 -07:00
Tao Bao baa841ed04 Merge "applypatch: {Load,Save}FileContents return bool values."
am: bae5f1a846

Change-Id: I1ee905f0182adb92d25208ba06a847afaf1835ba
2018-09-01 09:19:52 -07:00
Tao Bao bae5f1a846 Merge "applypatch: {Load,Save}FileContents return bool values." 2018-09-01 16:09:02 +00:00
Tao Bao 44b4a562b7 Merge "applypatch: Refactor applypatch()." am: af522672a2 am: 37521a9623
am: 7c83c139d6

Change-Id: I760b5159cc7bbe1ee5785447fbebb6650408e020
2018-08-31 14:47:35 -07:00
Tao Bao 7c83c139d6 Merge "applypatch: Refactor applypatch()." am: af522672a2
am: 37521a9623

Change-Id: Ib678a1af32e8d6a0d68672099ccf06b088780541
2018-08-31 14:43:03 -07:00