PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,559 Commits 1 Branch 0 Tags
bf049bffe2ea70e788e5c54ca307839232eb2f5d
Commit Graph

2559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yabin Cui bf049bffe2 resolve merge conflicts of ed4c49c to nyc-mr1-dev-plus-aosp 
Change-Id: I8788cc80473dc77bfa0cd2682f3acb6e17ac36df
 2016-06-21 11:09:38 -07:00
Yabin Cui ed4c49c199 Merge "Verify wipe package when wiping A/B device in recovery." into nyc-mr1-dev 2016-06-21 17:10:49 +00:00
Yabin Cui 6faf0265c9 Verify wipe package when wiping A/B device in recovery. 
To increase the security of wiping A/B devices, let uncrypt write
wipe package in misc partition. Then recovery verifies the wipe
package before wiping the device.

Bug: 29159185

Change-Id: I186691bab1928d3dc036bc5542abd64a81bc2168
 2016-06-20 18:18:02 -07:00
Bill Yi 23af9abbc8 Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 2c709ccef9 -s ours 
am: bf44cb7363  -s ours

Change-Id: Idab1e4edff135cf0f426aa6150e30f612e43937b
 2016-06-17 04:59:27 +00:00
Bill Yi bf44cb7363 Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master 
am: 2c709ccef9  -s ours

Change-Id: I36aaa841cc349605f0c2403f650ce2bcfa8f7e53
 2016-06-17 04:53:52 +00:00
Bill Yi 2c709ccef9 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-06-17 04:43:47 +00:00
Elliott Hughes 62bd0a9cb1 Merge \\\"Minor minadbd cleanup.\\\" am: a49c8a19da am: 98c97c8932 
am: aaa7c08cfa

Change-Id: I331002cbe7a01841600cfd2162772f9f343b4fdf
 2016-06-17 04:19:26 +00:00
Elliott Hughes aaa7c08cfa Merge \\"Minor minadbd cleanup.\\" am: a49c8a19da 
am: 98c97c8932

Change-Id: I416ad29724fa5975195ea55c17e4fe1e1495285f
 2016-06-17 04:13:40 +00:00
Elliott Hughes 98c97c8932 Merge \"Minor minadbd cleanup.\" 
am: a49c8a19da

Change-Id: Ie69f3c7d96292ad16f888fc63ee40bcd7c900a09
 2016-06-17 04:10:37 +00:00
Treehugger Robot a49c8a19da Merge "Minor minadbd cleanup." 2016-06-17 04:02:39 +00:00
Elliott Hughes 24eb8a0643 Minor minadbd cleanup. 
Distinguish our "services.cpp" more clearly from the regular adbd
"services.cpp", and remove a few useless includes of "sysdeps.h".

Change-Id: Ided4945a3ac5916133322ca7e95fa51add9abaa4
 2016-06-16 19:57:20 -07:00
Bill Yi 1957b47349 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I50fc8ab0611b65c43066331a7f9622a969d10080
 2016-06-16 14:02:37 -07:00
Tianjie Xu 51265b64a0 Check the results from applypatch am: 31f8cc84cf 
am: 93110c767f

Change-Id: I77be6c0fb2d26e5af1eef5cb3c14df20f964f7fa
 2016-06-16 18:12:11 +00:00
Tianjie Xu 24488eb7db Check the results from applypatch am: 31f8cc84cf 
am: d0dcbddd31

Change-Id: I00439aae8f79b0e2a5f7de6566110240492b526a
 2016-06-16 18:11:47 +00:00
Tianjie Xu d0dcbddd31 Check the results from applypatch 
am: 31f8cc84cf

Change-Id: Ie50652158b65d723346ffff18c85cbaab11820e1
 2016-06-16 18:09:19 +00:00
Tianjie Xu 93110c767f Check the results from applypatch 
am: 31f8cc84cf

Change-Id: I2ea241fb3e688f5f8b0558d638dd3ed502223f97
 2016-06-16 18:08:59 +00:00
Tao Bao 7676a9cb58 tests: Remove obsolete MTD support. am: 7eb60efa8d 
am: 28a425aa1f

Change-Id: Ib6cd24a3ac5a5f36d625e18ad2ae597a2aa4cf96
 2016-06-16 16:42:47 +00:00
Tao Bao 28a425aa1f tests: Remove obsolete MTD support. 
am: 7eb60efa8d

Change-Id: I87843f8c1b99aa3c5c64ff46f7ab86fde6a5e25a
 2016-06-16 16:39:33 +00:00
Tao Bao 7eb60efa8d tests: Remove obsolete MTD support. 
Track the change in commit 63a319201f and
fix builds.

Bug: http://b/29250988
Change-Id: Iad5be953e102020931649629afc980d585ed2931
(cherry picked from commit ab2fb94bf4)
 2016-06-16 16:19:46 +00:00
Tao Bao c485b9ce37 tests: Remove obsolete MTD support. 
am: ab2fb94bf4

Change-Id: I12728b0c3f9b4f276b031a16b94080822f6e5f63
 2016-06-16 04:34:52 +00:00
Tao Bao ab2fb94bf4 tests: Remove obsolete MTD support. 
Track the change in commit 63a319201f and
fix builds.

Bug: http://b/29250988
Change-Id: Iad5be953e102020931649629afc980d585ed2931
 2016-06-15 21:18:13 -07:00
Tianjie Xu 31f8cc84cf Check the results from applypatch 
Check the results from applypatch in PerformCommandDiff; and abort the
update on failure.

Bug:29339536
Change-Id: I5087d79ba532b54250f4c17560524255c8a4fabc
 2016-06-15 23:26:59 +00:00
Elliott Hughes 2ccce05244 Merge \\\"Remove an abused global so we can actually see logging.\\\" am: 37450d7f42 am: 4692e5d8c8 
am: d71cf2eee3

Change-Id: Iffce8a8df482812bce158179df5af6914195d940
 2016-06-15 23:21:38 +00:00
Elliott Hughes 1777eb7cf5 Merge \\\"init now uses libprocessgroup, so set up /acct.\\\" am: 279876c932 am: c58d7dda8c 
am: a087302da7

Change-Id: I3f27534e7677de790c4ea931bfabf429add49132
 2016-06-15 23:21:38 +00:00
Elliott Hughes d71cf2eee3 Merge \\"Remove an abused global so we can actually see logging.\\" am: 37450d7f42 
am: 4692e5d8c8

Change-Id: Idf78bf71a0670997da754d0de93691db313aed57
 2016-06-15 23:18:43 +00:00
Elliott Hughes a087302da7 Merge \\"init now uses libprocessgroup, so set up /acct.\\" am: 279876c932 
am: c58d7dda8c

Change-Id: I8398a7b4b95979d6502545dcfd931a5ce0d28069
 2016-06-15 23:18:42 +00:00
Elliott Hughes 4692e5d8c8 Merge \"Remove an abused global so we can actually see logging.\" 
am: 37450d7f42

Change-Id: Id9c78be08f2822ec92d54ba11693d3e5adb7b5aa
 2016-06-15 23:16:14 +00:00
Elliott Hughes c58d7dda8c Merge \"init now uses libprocessgroup, so set up /acct.\" 
am: 279876c932

Change-Id: I32a89d5d0b41311775dacea1f7d44fe1f6654d2d
 2016-06-15 23:16:13 +00:00
Treehugger Robot 37450d7f42 Merge "Remove an abused global so we can actually see logging." 2016-06-15 23:10:32 +00:00
Elliott Hughes 279876c932 Merge "init now uses libprocessgroup, so set up /acct." 2016-06-15 23:09:19 +00:00
Elliott Hughes b36980cc09 resolve merge conflicts of 179c0d8 to stage-aosp-master am: 274d17dc0f 
am: eaddde6888

Change-Id: I10d484d02389fa30cc8d8398bcf5b276de31432e
 2016-06-15 22:33:02 +00:00
Elliott Hughes eaddde6888 resolve merge conflicts of 179c0d8 to stage-aosp-master 
am: 274d17dc0f

Change-Id: I356adf332d5749a6d3f3e29b99bf3fca35de349a
 2016-06-15 22:28:05 +00:00
Elliott Hughes 274d17dc0f resolve merge conflicts of 179c0d8 to stage-aosp-master 
Change-Id: Iba5aec266444cabf83f600f2bdb45a3c027e5995
 2016-06-15 15:22:17 -07:00
Elliott Hughes 48ebb07211 init now uses libprocessgroup, so set up /acct. 
Change-Id: Iec1492dfaf2ceae6f4d8618dd725d07316ee960b
 2016-06-15 15:15:15 -07:00
Elliott Hughes 59bf0da22f Remove an abused global so we can actually see logging. 
Change-Id: Ib97440bc0542003b84c45cb05f194ba20104dad6
 2016-06-15 15:14:04 -07:00
Elliott Hughes 179c0d80bc Merge "Remove obsolete MTD support." 2016-06-15 21:55:15 +00:00
Tao Bao ef9718483b Merge \\\"Add bootloader_message_ab struct.\\\" am: 59f04b9982 am: f57d7f02c9 
am: 2fc7cd69fd

Change-Id: If4dce87bc57f0a305538507844c96084bec45d0c
 2016-06-14 16:27:34 +00:00
Tao Bao 2fc7cd69fd Merge \\"Add bootloader_message_ab struct.\\" am: 59f04b9982 
am: f57d7f02c9

Change-Id: Ie2407db5b16f90cbd07ada2d96441aba4055e6c9
 2016-06-14 16:22:55 +00:00
Tao Bao f57d7f02c9 Merge \"Add bootloader_message_ab struct.\" 
am: 59f04b9982

Change-Id: I9c3a816243a03dc2723679ef6efa241361446b96
 2016-06-14 16:18:22 +00:00
Tao Bao 59f04b9982 Merge "Add bootloader_message_ab struct." 2016-06-14 16:09:16 +00:00
Tao Bao 21793c32be resolve merge conflicts of 490fad6 to nyc-dev-plus-aosp 
am: 38afad46d8

Change-Id: I597370534ef1bd4d65fea9e6054a499f88b282e9
 2016-06-14 02:20:26 +00:00
Tao Bao ff38526b22 resolve merge conflicts of 2a4386f to nyc-mr1-dev-plus-aosp 
Change-Id: I70eef6efaba6990fdae2b58b3bbca03407b6676e
 2016-06-13 19:17:07 -07:00
Tao Bao 38afad46d8 resolve merge conflicts of 490fad6 to nyc-dev-plus-aosp 
Change-Id: I299fe15977c1a59d0c784728872c3a7f63c95e56
 2016-06-13 19:12:46 -07:00
Tao Bao 2a4386fa7b applypatch: Don\'t call inflate() when it expects zero-length output. 
am: 490fad6791

Change-Id: Id4df6fd73edf70ce88d3df4a5ebaeb665f38eef3
 2016-06-14 01:29:09 +00:00
Tao Bao 490fad6791 applypatch: Don't call inflate() when it expects zero-length output. 
We may have expanded_len == 0 when calling inflate(). After switching to
using std::vector, it passes a nullptr buffer to inflate() and leads to
Z_STREAM_ERROR.

Bug: 29312140
Change-Id: Iab7c6c07a9e8488e844e7cdda76d02bd60d2ea98
 2016-06-13 16:42:52 -07:00
Tao Bao 0146b37256 Merge \"recovery: Track the name change for wipe_ab.\" into nyc-mr1-dev 
am: dc1393d09b

Change-Id: I7ec8d93bb41d0bd7f921fbb97c5b8639798e3bec
 2016-06-13 16:50:43 +00:00
Tao Bao dc1393d09b Merge "recovery: Track the name change for wipe_ab." into nyc-mr1-dev 2016-06-13 16:43:46 +00:00
Tao Bao d241c85cd0 Merge \\\"updater: Fix the broken ReadFileFn.\\\" am: 4ddd5edf31 am: 89dfe730d4 
am: 1e67422f37

Change-Id: I3beade52bfaeea0e84055d007d82ff2ef5c07dbb
 2016-06-11 18:57:05 +00:00
Tao Bao 1e67422f37 Merge \\"updater: Fix the broken ReadFileFn.\\" am: 4ddd5edf31 
am: 89dfe730d4

Change-Id: Ia465c92d341da4681d3490151a20e1e117271e52
 2016-06-11 18:53:14 +00:00
Tao Bao 89dfe730d4 Merge \"updater: Fix the broken ReadFileFn.\" 
am: 4ddd5edf31

Change-Id: Id73ccb86a3869198baf84b7978054b174c281c79
 2016-06-11 18:49:21 +00:00