PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,019 Commits 1 Branch 0 Tags
6adbc2c98255cd063b44572c898f21477e7946f2
Commit Graph

3019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao 6adbc2c982 resolve merge conflicts of 09ab9a6 to nyc-mr1-dev-plus-aosp 
am: e708954c8c

Change-Id: I06343fdf7d7173e689d136bacb382fde3e3873b9
 2016-10-09 21:54:57 +00:00
Tao Bao e708954c8c resolve merge conflicts of 09ab9a6 to nyc-mr1-dev-plus-aosp 
Change-Id: Ifc0b085d8384f373ffffc14abd907227961efdf9
 2016-10-09 14:30:46 -07:00
Tao Bao 09ab9a6838 Merge "Disable the meaningless parts of the UI for A/B." am: aa4924cab1 
am: 8477a03a4a

Change-Id: I55c5febd094ada3a1147ab3ebefc866108ce33e8
 2016-10-09 21:13:47 +00:00
Tao Bao 8477a03a4a Merge "Disable the meaningless parts of the UI for A/B." 
am: aa4924cab1

Change-Id: Iaba41f4d5a4581053813beb99366cac4068725bb
 2016-10-09 21:08:47 +00:00
Tao Bao aa4924cab1 Merge "Disable the meaningless parts of the UI for A/B." 2016-10-09 21:00:37 +00:00
Elliott Hughes b0c3f6ffeb Disable the meaningless parts of the UI for A/B. 
Bug: http://b/28748484
Test: mmma bootable/recovery
Change-Id: Ie86a265f4699503471e7c717d65677a916dbd25b
(cherry picked from commit 01fcbe160b)
 2016-10-09 12:55:50 -07:00
Tao Bao 8570f7efd1 resolve merge conflicts of 713ad36 to master 
Change-Id: I493df6f84005af600d92c6cb3df58de53a5c2d55
 2016-10-04 23:35:38 -07:00
Tao Bao 713ad360c4 Merge "edify: Move State.script and State.errmsg to std::string." am: 8810634773 am: 6674f22a2f 
am: e68d829f74

Change-Id: I8d9b94ca96b68a80f1418287bde4bef26ce0068a
 2016-10-05 06:18:52 +00:00
Tao Bao e68d829f74 Merge "edify: Move State.script and State.errmsg to std::string." am: 8810634773 
am: 6674f22a2f

Change-Id: I7da4df259a8155fbdab6e696fab4ddfb45cb0fbc
 2016-10-05 06:16:22 +00:00
Tao Bao 6674f22a2f Merge "edify: Move State.script and State.errmsg to std::string." 
am: 8810634773

Change-Id: Id8e786de6fe76287b598dfcfbf962eba5d9ebde2
 2016-10-05 06:13:22 +00:00
Treehugger Robot 8810634773 Merge "edify: Move State.script and State.errmsg to std::string." 2016-10-05 06:07:56 +00:00
Tao Bao 876b9391c0 edify: Move State.script and State.errmsg to std::string. 
This way we kill a few strdup() and free() calls.

Test: 1. recovery_component_test still passes;
2. Applying an update with the new updater works;
3. The error code in a script with abort("E310: xyz") is recorded into
last_install correctly.

Change-Id: Ibda4da5937346e058a0d7cc81764d6f02920010a
(cherry picked from commit 59dcb9cbea)
 2016-10-04 15:33:22 -07:00
Tao Bao 59dcb9cbea edify: Move State.script and State.errmsg to std::string. 
This way we kill a few strdup() and free() calls.

Test: 1. recovery_component_test still passes;
2. Applying an update with the new updater works;
3. The error code in a script with abort("E310: xyz") is recorded into
last_install correctly.

Change-Id: Ibda4da5937346e058a0d7cc81764d6f02920010a
 2016-10-04 14:24:32 -07:00
Mark Salyzyn 414d71ebf1 Merge "recovery: drop log/logger.h" am: 38b923ff6c am: 7cf7e6ce4f am: 0467a905cc 
am: 04f3fad29a

Change-Id: I69945b52c9889884bf356a7693947a489a1ae382
 2016-10-04 17:51:41 +00:00
Mark Salyzyn 04f3fad29a Merge "recovery: drop log/logger.h" am: 38b923ff6c am: 7cf7e6ce4f 
am: 0467a905cc

Change-Id: Idf6e3b08ac2f6209856bbad010a5f48197124597
 2016-10-04 17:49:44 +00:00
Mark Salyzyn 0467a905cc Merge "recovery: drop log/logger.h" am: 38b923ff6c 
am: 7cf7e6ce4f

Change-Id: Ic62c9145a6d891b2e9acd871c0e21007e2ecb6f6
 2016-10-04 17:45:11 +00:00
Mark Salyzyn 7cf7e6ce4f Merge "recovery: drop log/logger.h" 
am: 38b923ff6c

Change-Id: I92ddb6d9adef3f4a25588c76bade058914952b06
 2016-10-04 17:42:40 +00:00
Mark Salyzyn 38b923ff6c Merge "recovery: drop log/logger.h" 2016-10-04 17:39:17 +00:00
Tao Bao 254c4bfbd4 Merge "edify: Move the testcases to gtest." am: 0bc2df1696 am: 6fbed10fa5 am: bace857dbb 
am: 1f19e82930

Change-Id: Iced6882f71a74d3e65045f8ced73edb58493555d
 2016-10-04 17:06:09 +00:00
Tao Bao 1f19e82930 Merge "edify: Move the testcases to gtest." am: 0bc2df1696 am: 6fbed10fa5 
am: bace857dbb

Change-Id: I181613c85d81366fb517ce4851256cb1a637af15
 2016-10-04 17:04:10 +00:00
Tao Bao bace857dbb Merge "edify: Move the testcases to gtest." am: 0bc2df1696 
am: 6fbed10fa5

Change-Id: I1966d1fff2972fae1b4c9a1fe6fdbc07c34dcd65
 2016-10-04 17:01:38 +00:00
Tao Bao 6fbed10fa5 Merge "edify: Move the testcases to gtest." 
am: 0bc2df1696

Change-Id: I6c61d04cb7d2b47ef903d838ead453f51eb91ea7
 2016-10-04 16:59:38 +00:00
Tao Bao 0bc2df1696 Merge "edify: Move the testcases to gtest." 2016-10-04 16:55:50 +00:00
Mark Salyzyn fee79a4532 recovery: drop log/logger.h 
private/android_logger.h contains all we need.

Test: compile
Bug: 26552300
Bug: 31289077
Bug: 31456426
Change-Id: I6714d730372dc81f784e7f9dfee8a33848643a5d
 2016-10-04 09:04:08 -07:00
Tao Bao d770d2e7af edify: Move the testcases to gtest. 
Now they live in tests/component/edify_test.cpp.

Also rename edify/main.cpp to edify/edify_parser.cpp. It becomes a
host-side debugging tool that validates the input edify script. However,
it supports edify builtin functions only and doesn't recognize the ones
defined via updater.

Test: recovery_component_test passes on device.

Change-Id: Ib94a787bf15098a9cc078d256b6a6dc96ff12b2e
 2016-10-03 15:33:20 -07:00
Tianjie Xu 0a33c02df4 Merge "Turn on -Werror for recovery" into nyc-mr1-dev-plus-aosp 
am: 209e5acf4a

Change-Id: Ie13be805792a3433d58c2805f8325dfe78795bd4
 2016-09-30 20:34:24 +00:00
Tianjie Xu 10e223c181 Turn on -Werror for recovery 
am: 17e316cce0

Change-Id: Ia0e1948491edf7cca8b64d7e7f0cac91314c2025
 2016-09-30 20:34:23 +00:00
Tianjie Xu 3ddd6fd4cf Merge "Turn on -Werror for recovery" am: 695ef7cacc am: 5269808bb0 am: dbde5cf1d5 -s ours 
am: 8c403082d6

Change-Id: I546d2fd12e3c57fee7ebcf8d3e3a5b56b57f1163
 2016-09-30 20:34:13 +00:00
Tianjie Xu 209e5acf4a Merge "Turn on -Werror for recovery" into nyc-mr1-dev-plus-aosp 2016-09-30 20:27:53 +00:00
Tianjie Xu 8c403082d6 Merge "Turn on -Werror for recovery" am: 695ef7cacc am: 5269808bb0 
am: dbde5cf1d5  -s ours

Change-Id: I0649c3db276212804118ab4a6d7ced150585af91
 2016-09-30 20:27:18 +00:00
Tianjie Xu 17e316cce0 Turn on -Werror for recovery 
Also remove the 0xff comparison when validating the bootloader
message fields. As the fields won't be erased to 0xff after we
remove the MTD support.

Bug: 28202046
Test: The recovery folder compiles for aosp_x86-eng
Change-Id: Ibb30ea1b2b28676fb08c7e92a1e5f7b6ef3247ab
(cherry picked from commit 7aa88748f6)
 2016-09-30 11:18:01 -07:00
Tianjie Xu dbde5cf1d5 Merge "Turn on -Werror for recovery" am: 695ef7cacc 
am: 5269808bb0

Change-Id: I84ce95dc0365925535da0d5bfb9397c5b23bd1af
 2016-09-30 17:48:23 +00:00
Tianjie Xu 5269808bb0 Merge "Turn on -Werror for recovery" 
am: 695ef7cacc

Change-Id: If8cb1fd9470c4ae6798dc4ecf1707c5eb40b877e
 2016-09-30 17:45:35 +00:00
Tianjie Xu 695ef7cacc Merge "Turn on -Werror for recovery" 2016-09-30 17:41:14 +00:00
Tianjie Xu 7aa88748f6 Turn on -Werror for recovery 
Also remove the 0xff comparison when validating the bootloader
message fields. As the fields won't be erased to 0xff after we
remove the MTD support.

Bug: 28202046
Test: The recovery folder compiles for aosp_x86-eng
Change-Id: Ibb30ea1b2b28676fb08c7e92a1e5f7b6ef3247ab
 2016-09-29 19:21:24 -07:00
Tianjie Xu e792fa4629 Merge "Report uncrypt errors in details" into nyc-mr1-dev-plus-aosp 
am: 4c3f6ab8f7

Change-Id: I50e5c8484768c10604bd78ce7bba5c2e83bc6f04
 2016-09-29 19:44:26 +00:00
Tianjie Xu c8fbbc786c Report uncrypt errors in details 
am: 68fc81e860

Change-Id: I57eff7b0aaa388c32dc8e99318e68ca25ff5c02d
 2016-09-29 19:44:26 +00:00
TreeHugger Robot 4c3f6ab8f7 Merge "Report uncrypt errors in details" into nyc-mr1-dev-plus-aosp 2016-09-29 18:51:02 +00:00
Tianjie Xu 31ee16223b DO NOT MERGE Report uncrypt errors in details am: 37d7d67ca2 am: 4c53af080d -s ours 
am: 2eea42f723  -s ours

Change-Id: Ie6d9a47705e023565ff9fed8676be0ca63df68a8
 2016-09-29 18:33:51 +00:00
Tianjie Xu 68fc81e860 Report uncrypt errors in details 
Add the error codes for uncrypt and report the failure details in
uncrypt_status.

Test: uncrypt_error logs correctly in last_install
Bug: 31603820
Change-Id: I8e0de845ce1707b6f8f5ae84564c5e93fd5f5ef5
(cherry picked from commit 0c68675f5ae80cd669e0bf014a69689b6fe08eee)
 2016-09-29 11:27:46 -07:00
Tianjie Xu 2eea42f723 DO NOT MERGE Report uncrypt errors in details am: 37d7d67ca2 
am: 4c53af080d  -s ours

Change-Id: I16ccd19d5b430c1854e5544c9c7d50be534b970f
 2016-09-29 18:26:50 +00:00
Tianjie Xu 4c53af080d DO NOT MERGE Report uncrypt errors in details 
am: 37d7d67ca2

Change-Id: I4da910cde3f1a84b9dfb5839a43b00818a942dbd
 2016-09-29 18:13:20 +00:00
Tianjie Xu 37d7d67ca2 DO NOT MERGE Report uncrypt errors in details 
Add the error codes for uncrypt and report the failure details in
uncrypt_status.

Test: uncrypt_error logs correctly in last_install
Bug: 31603820
Change-Id: I8e0de845ce1707b6f8f5ae84564c5e93fd5f5ef5
(cherry picked from commit da44cf18f3)
 2016-09-29 18:06:04 +00:00
Tianjie Xu 553d47bf91 Merge "Report uncrypt errors in details" am: af8b9363c6 am: 7582609d61 am: fc887a8fba 
am: b0d0ee3c7d

Change-Id: Ie44169accea9196457d7cae696836c3a6fe14c8e
 2016-09-27 21:27:56 +00:00
Tianjie Xu b0d0ee3c7d Merge "Report uncrypt errors in details" am: af8b9363c6 am: 7582609d61 
am: fc887a8fba

Change-Id: I5e83be10f4443c8b107821975b3506381fcbdf0c
 2016-09-27 21:25:26 +00:00
Tianjie Xu fc887a8fba Merge "Report uncrypt errors in details" am: af8b9363c6 
am: 7582609d61

Change-Id: Idbaf422f605c690fe2f2ea120d10e4e37342b5e9
 2016-09-27 21:22:26 +00:00
Tianjie Xu 7582609d61 Merge "Report uncrypt errors in details" 
am: af8b9363c6

Change-Id: I5790f1c3ce902edf7bf9025e445b043c93036a30
 2016-09-27 21:19:56 +00:00
Treehugger Robot af8b9363c6 Merge "Report uncrypt errors in details" 2016-09-27 21:11:06 +00:00
Tao Bao 1040ae5833 resolve merge conflicts of 64b92df to nyc-mr1-dev-plus-aosp 
am: 772153b3c7

Change-Id: I1fcc0375b08dc776a9cc3f122b071d34241e29c8
 2016-09-27 20:38:23 +00:00
Tao Bao 772153b3c7 resolve merge conflicts of 64b92df to nyc-mr1-dev-plus-aosp 
Change-Id: I1b076d3f9b82380c74e66fe95ee8e8cf5b6eebf7
 2016-09-27 13:30:43 -07:00