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

2127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mattias Nissler 95b96d98ca Merge "Move dumpkey tool to the recovery repo." am: 5197fde242 
am: b652678953

* commit 'b652678953f1ff3920bebdd97836eda061a9a36b':
  Move dumpkey tool to the recovery repo.
 2016-02-26 08:19:34 +00:00
Mattias Nissler b652678953 Merge "Move dumpkey tool to the recovery repo." 
am: 5197fde242

* commit '5197fde242e00d6ee112896846da8d0be6303c56':
  Move dumpkey tool to the recovery repo.
 2016-02-26 08:18:02 +00:00
Mattias Nissler 5197fde242 Merge "Move dumpkey tool to the recovery repo." 2016-02-26 08:16:34 +00:00
Paul Lawrence 8c3922f4ab Move recovery\'s convert_fbe folder to /tmp 
am: 661f8a69f2

* commit '661f8a69f2b12f3244deed664ab69a9d2efad7fb':
  Move recovery's convert_fbe folder to /tmp
 2016-02-25 21:37:01 +00:00
Paul Lawrence 661f8a69f2 Move recovery's convert_fbe folder to /tmp 
The cache folder is no longer available at this time

Bug: 27355824
Change-Id: I74e33266c1ff407364981b186613f81319dd22dc
 2016-02-25 13:07:16 -08:00
Mattias Nissler 03b72b0f37 Move dumpkey tool to the recovery repo. 
The dumpkey tool is used to dump encryption keys in a custom format
used by the recovery code. Nobody else uses this format AFAICT, so
it's more appropriate to keep the code of the tool alongside the
recovery code instead of next to mincrypt.

BUG:27326256
Change-Id: I30176845617972be1d6e46e9a9218e161fbf0680
 2016-02-24 14:53:10 +01:00
Josh Gao 744284bea0 Merge "minadbd: update for adb_thread_create signature change." into nyc-dev 
am: 0757a093c1

* commit '0757a093c187b64867a9ca7c97b80d9aa7d665cf':
  minadbd: update for adb_thread_create signature change.
 2016-02-24 00:53:17 +00:00
Josh Gao 0757a093c1 Merge "minadbd: update for adb_thread_create signature change." into nyc-dev 2016-02-24 00:50:36 +00:00
Yabin Cui 2be10be7d0 recovery: check battery level before installing package. 
am: 99281df8e2

* commit '99281df8e2eb6a302ccbcfd790a6889392541264':
  recovery: check battery level before installing package.
 2016-02-23 23:00:48 +00:00
Tianjie Xu cc5372006f Merge "Surpress warnings in minzip/Zip.c" am: 4b3cdce702 
am: 0d63468171

* commit '0d63468171a80bd84a859fbd36b8d874f030c764':
  Surpress warnings in minzip/Zip.c
 2016-02-23 19:30:13 +00:00
Tianjie Xu 0d63468171 Merge "Surpress warnings in minzip/Zip.c" 
am: 4b3cdce702

* commit '4b3cdce702fefa7eac0626f57d09ff018127c191':
  Surpress warnings in minzip/Zip.c
 2016-02-23 19:25:11 +00:00
Tianjie Xu 4b3cdce702 Merge "Surpress warnings in minzip/Zip.c" 2016-02-23 19:16:42 +00:00
Tianjie Xu 6629655476 Surpress warnings in minzip/Zip.c 
bootable/recovery/minzip/Zip.c:514:5: warning: Value stored to 'compRemaining' is never read
    compRemaining = pEntry->compLen;
        ^               ~~~~~~~~~~~~~~~
  bootable/recovery/minzip/Zip.c:778:9: warning: Null pointer argument in call to memory copy function
    memcpy(p, helper->targetDir, helper->targetDirLen);
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Bug: 27229894
Change-Id: I0482bac3a4fcddc191783d1e5b5a83cf29fa4e85
 2016-02-23 11:15:43 -08:00
Yabin Cui 99281df8e2 recovery: check battery level before installing package. 
Bug: 26879394

Change-Id: I63dce5bc50c2e104129f1bcab7d3cad5682bf45d
(cherry picked from commit 53e7a0628f)
 2016-02-23 11:03:10 -08:00
Yabin Cui 71c06eb1f7 Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 am: ae68f02272 am: a3604da6e1 
am: 089fe38ac5

* commit '089fe38ac5a3f12588cc5728ee11a1b0c6f436f3':
  Fix integer overflows in recovery procedure.
 2016-02-23 06:59:15 +00:00
Yabin Cui 089fe38ac5 Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 am: ae68f02272 
am: a3604da6e1

* commit 'a3604da6e17afbf5b98f1eb2c5fc16bde1731b85':
  Fix integer overflows in recovery procedure.
 2016-02-23 06:56:27 +00:00
Yabin Cui a3604da6e1 Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 
am: ae68f02272

* commit 'ae68f0227262d08f250e4cccda6f03b9981bf56d':
  Fix integer overflows in recovery procedure.
 2016-02-23 06:53:47 +00:00
Yabin Cui ae68f02272 Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 
am: 682d691052

* commit '682d6910526a55e6a20e27cde3cf7515fa07a97b':
  Fix integer overflows in recovery procedure.
 2016-02-23 06:50:58 +00:00
Yabin Cui 682d691052 Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 
am: cae056f219

* commit 'cae056f21908173bcf2fa9a1724e46f16abb3258':
  Fix integer overflows in recovery procedure.
 2016-02-23 06:47:37 +00:00
Yabin Cui 80563ee93a resolve merge conflicts of e5d3d15cd2 to nyc-dev 
am: 0d28ba452f

* commit '0d28ba452fb8884f3dfeb20fab193be5343ec29e':
  Fix integer overflows in recovery procedure.
 2016-02-23 06:46:45 +00:00
Yabin Cui cae056f219 Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a 
am: f4ee1720f3

* commit 'f4ee1720f33a01518f79a2bf8df4664dab3564d4':
  Fix integer overflows in recovery procedure.
 2016-02-23 06:44:46 +00:00
Yabin Cui f4ee1720f3 Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 
am: 877dcba47a

* commit '877dcba47ac311aa65b27e42b3625bcb58d84e47':
  Fix integer overflows in recovery procedure.
 2016-02-23 06:42:07 +00:00
Yabin Cui 877dcba47a Fix integer overflows in recovery procedure. am: 1273956e69 
am: 5978a71d29

* commit '5978a71d2954c7df02cbd0c51582ce4063346f77':
  Fix integer overflows in recovery procedure.
 2016-02-23 06:35:46 +00:00
Yabin Cui 5978a71d29 Fix integer overflows in recovery procedure. 
am: 1273956e69

* commit '1273956e69a7d1d5b636f269050b446e0ced3f9b':
  Fix integer overflows in recovery procedure.
 2016-02-23 06:33:20 +00:00
Yabin Cui 0d28ba452f resolve merge conflicts of e5d3d15cd2 to nyc-dev 
Change-Id: Ie8b30e6b114b648e8c03866456c64cf8b740d1e3
 2016-02-22 22:16:44 -08:00
Tao Bao 842f2d8ccf Merge "Control fault injection with config files instead of build flags" am: ed796b046d 
am: 24b3622933

* commit '24b3622933092c7227a391939f3f1cdcd3d7c999':
  Control fault injection with config files instead of build flags
 2016-02-23 05:04:42 +00:00
Tao Bao 24b3622933 Merge "Control fault injection with config files instead of build flags" 
am: ed796b046d

* commit 'ed796b046daf574b1f4f9ef386a870c845457277':
  Control fault injection with config files instead of build flags
 2016-02-23 04:57:39 +00:00
Tao Bao ed796b046d Merge "Control fault injection with config files instead of build flags" 2016-02-23 04:50:47 +00:00
Yabin Cui e5d3d15cd2 Fix integer overflows in recovery procedure. am: 4f2df162c6 
am: 2800876140

* commit '2800876140425749d8d3fd8339f5c4b55ee0e185':
  Fix integer overflows in recovery procedure.
 2016-02-23 02:39:21 +00:00
Yabin Cui 2800876140 Fix integer overflows in recovery procedure. 
am: 4f2df162c6

* commit '4f2df162c6ab4a71ca86e4b38735b681729c353b':
  Fix integer overflows in recovery procedure.
 2016-02-23 02:33:18 +00:00
Yabin Cui 1273956e69 Fix integer overflows in recovery procedure. 
Bug: 26960931
Change-Id: Ieae45caccfb4728fcf514f0d920976585d8e6caf
(cherry picked from commit 4f2df162c6)
 2016-02-22 17:42:02 -08:00
Jed Estep 39c1b5e872 Control fault injection with config files instead of build flags 
Bug: 26570379
Change-Id: I76109d09276d6e3ed3a32b6fedafb2582f545c0c
(cherry picked from commit d940887dde)
 2016-02-22 17:31:12 -08:00
Josh Gao cd324766ab minadbd: update for adb_thread_create signature change. 
Change-Id: Ifa0b4d8c1cf0bb39abac61984ff165e82e41222c
(cherry picked from commit cc07b35565)
 2016-02-22 15:44:53 -08:00
Yabin Cui 9ade9e6c41 Merge "recovery: check battery level before installing package." am: 16d0a18514 
am: d1b66ad6a1

* commit 'd1b66ad6a117188751b1342d77edb9756a00ae87':
  recovery: check battery level before installing package.
 2016-02-22 23:13:38 +00:00
Yabin Cui d1b66ad6a1 Merge "recovery: check battery level before installing package." 
am: 16d0a18514

* commit '16d0a185142cff938d94f668e97cb95b4e742199':
  recovery: check battery level before installing package.
 2016-02-22 23:05:26 +00:00
Yabin Cui 16d0a18514 Merge "recovery: check battery level before installing package." 2016-02-22 22:53:52 +00:00
Jed Estep fc4971ba52 Fix verifier test base testdata directory after merge conflict 
am: e1305768f6

* commit 'e1305768f69ed8a3cf810f1204a3a2c519747716':
  Fix verifier test base testdata directory after merge conflict
 2016-02-22 19:49:04 +00:00
Yabin Cui 4f2df162c6 Fix integer overflows in recovery procedure. 
Bug: 26960931
Change-Id: Ieae45caccfb4728fcf514f0d920976585d8e6caf
(cherry picked from commit a029c9a458)
 2016-02-22 11:02:08 -08:00
Jed Estep e1305768f6 Fix verifier test base testdata directory after merge conflict 
Change-Id: I7ffba0be5a6befc875ce59b51a008c1892e7d34b
 2016-02-22 10:59:37 -08:00
Yabin Cui 53e7a0628f recovery: check battery level before installing package. 
Bug: 26879394

Change-Id: I63dce5bc50c2e104129f1bcab7d3cad5682bf45d
 2016-02-19 18:08:09 -08:00
Elliott Hughes 149b9eb2d8 Merge "Fix minui cleanup path on error." am: fa9af7dae6 
am: af38cd9330

* commit 'af38cd9330d2ee2c96a807e328beb008cd10d789':
  Fix minui cleanup path on error.
 2016-02-20 00:47:28 +00:00
Elliott Hughes af38cd9330 Merge "Fix minui cleanup path on error." 
am: fa9af7dae6

* commit 'fa9af7dae68aad09ed624a9786f6cd57713f7b7f':
  Fix minui cleanup path on error.
 2016-02-20 00:40:46 +00:00
Elliott Hughes fa9af7dae6 Merge "Fix minui cleanup path on error." 2016-02-20 00:30:19 +00:00
Elliott Hughes 7d626df079 Fix minui cleanup path on error. 
bootable/recovery/minui/resources.cpp:321:21: warning: Branch condition evaluates to a garbage value
                if (surface[i]) free(surface[i]);
                    ^~~~~~~~~~
  bootable/recovery/minui/resources.cpp:424:13: warning: Value stored to 'len' during its initialization is never read
        int len = row[4];
            ^~~   ~~~~~~

Bug: http://b/27264652
Change-Id: Icc1a914c59d6a89dab1b752b2cd2b40549566481
 2016-02-19 10:33:01 -08:00
Tao Bao 2dd284b616 DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. am: 8559bbfb3b -s ours am: 52991c4639 -s ours 
am: a4436f7b25  -s ours

* commit 'a4436f7b25e4b27108a3b6a0be4f244e356f8ffc':
  DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB.
 2016-02-19 17:39:12 +00:00
Tao Bao a4436f7b25 DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. am: 8559bbfb3b -s ours 
am: 52991c4639  -s ours

* commit '52991c4639347a2e2b098949fdf91c305f8d41dd':
  DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB.
 2016-02-19 17:33:52 +00:00
Tao Bao 52991c4639 DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. 
am: 8559bbfb3b  -s ours

* commit '8559bbfb3b988b1b8790702d277715fc429cc1d8':
  DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB.
 2016-02-19 17:29:34 +00:00
Tao Bao 8559bbfb3b DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. 
Commit [1] made similar changes into AOSP code, but it requires multiple
CLs to cherry-pick into cw-e branch. So we make a separate CL to fix the
issue.

[1] commit bd82b27341

Bug: 27247370
Change-Id: Id5c08a6a29284353f891cdbaa224feee891f3807
 2016-02-19 08:39:25 -08:00
Bill Yi 4b327342fc Merge commit \'ce46828e08281dc507d4e40ba9e8b770bc21cf0b\' into HEAD 
am: dfe43869cb

* commit 'dfe43869cbeaf03f0950cf483f419bd9626473a5':
 2016-02-17 20:44:25 +00:00
Bill Yi dfe43869cb Merge commit 'ce46828e08281dc507d4e40ba9e8b770bc21cf0b' into HEAD 2016-02-17 09:50:14 -08:00