Commit Graph

2139 Commits

Author SHA1 Message Date
Paul Lawrence e048f0ba7f Move recovery\'s convert_fbe folder to /tmp am: 661f8a69f2
am: 8c3922f4ab

* commit '8c3922f4ab9755180d42e3f8162590892a029247':
  Move recovery's convert_fbe folder to /tmp
2016-02-25 21:45:00 +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
Josh Gao 61d1bd7156 Merge "minadbd: update for adb_thread_create signature change." into nyc-dev am: 0757a093c1
am: 744284bea0

* commit '744284bea06f806f30f67ea3364b200ed871dcb6':
  minadbd: update for adb_thread_create signature change.
2016-02-24 01:00:20 +00: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 8cb6069499 recovery: check battery level before installing package. am: 99281df8e2
am: 2be10be7d0

* commit '2be10be7d0721ecbff3d0270c5f3026456902b6a':
  recovery: check battery level before installing package.
2016-02-23 23:13:56 +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 90c75ddc05 Merge "Surpress warnings in minzip/Zip.c" am: 4b3cdce702 am: 0d63468171
am: cc5372006f

* commit 'cc5372006f6e423e4c3f68b3dc81694fd92a7046':
  Surpress warnings in minzip/Zip.c
2016-02-23 19:38:05 +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 fc993df953 Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 am: ae68f02272 am: a3604da6e1 am: 089fe38ac5
am: 71c06eb1f7

* commit '71c06eb1f733b4afed3698566477a97487ed22aa':
  Fix integer overflows in recovery procedure.
2016-02-23 07:01:59 +00: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 eed03e7b16 resolve merge conflicts of e5d3d15cd2 to nyc-dev am: 0d28ba452f
am: 80563ee93a  -s ours

* commit '80563ee93a46479dfa30a1ee5fbcc9a94e528931':
  Fix integer overflows in recovery procedure.
2016-02-23 06:53:47 +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 e8a0a6d0d6 Merge "Control fault injection with config files instead of build flags" am: ed796b046d am: 24b3622933
am: 842f2d8ccf

* commit '842f2d8ccf4a5675b30a85e41aa3c391195e644b':
  Control fault injection with config files instead of build flags
2016-02-23 05:12:15 +00: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 30ed5b99f5 Merge "Control fault injection with config files instead of build flags" 2016-02-23 01:37:09 +00: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 bb3d4a102c Merge "recovery: check battery level before installing package." am: 16d0a18514 am: d1b66ad6a1
am: 9ade9e6c41

* commit '9ade9e6c418aacfcab3e1ec487c8c5c327b7a007':
  recovery: check battery level before installing package.
2016-02-22 23:23:59 +00: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 6fe9f89a6b Fix verifier test base testdata directory after merge conflict am: e1305768f6
am: fc4971ba52

* commit 'fc4971ba52b34d2b138cc975d328d1d586e84aea':
  Fix verifier test base testdata directory after merge conflict
2016-02-22 20:02:19 +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 2bb7624b6c Merge "Check each value read from block map file." 2016-02-22 18:36:22 +00:00
Yabin Cui 53e7a0628f recovery: check battery level before installing package.
Bug: 26879394

Change-Id: I63dce5bc50c2e104129f1bcab7d3cad5682bf45d
2016-02-19 18:08:09 -08:00
Yabin Cui 2e947ea55e Check each value read from block map file.
Bug: 26960931
Change-Id: I50b266ecb899db043831f528c2518bea76168c88
2016-02-19 17:54:25 -08:00
Elliott Hughes 4d230f78de Merge "Fix minui cleanup path on error." am: fa9af7dae6 am: af38cd9330
am: 149b9eb2d8

* commit '149b9eb2d82ae49e110c3fd95ab99dd726e0f9e8':
  Fix minui cleanup path on error.
2016-02-20 01:11:25 +00: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