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

2222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Kaiser ee772d426e resolve merge conflicts of 0222db01fd to nyc-dev-plus-aosp 
am: d2425ed063

* commit 'd2425ed063863b502600a4d80d01f362021bd61a':
  otafault: Fix setting of have_eio_error.
 2016-03-14 21:41:59 +00:00
Greg Kaiser d2425ed063 resolve merge conflicts of 0222db01fd to nyc-dev-plus-aosp 
Change-Id: I415774ace081b866226a74eebfd1013f7e5c49f3
 2016-03-14 14:13:54 -07:00
Greg Kaiser 0222db01fd Merge "otafault: Fix setting of have_eio_error." into nyc-dev 2016-03-14 20:44:36 +00:00
Greg Kaiser f4300bc126 otafault: Fix setting of have_eio_error. 
There was one case (ota_fsync, under TARGET_SYNC_FAULT, when the
filename was cached) where we were not setting have_eio_error
prior to returning.  We fix that.

Change-Id: I2b0aa61fb1e821f0e77881aba04db95cd8396812
 2016-03-14 12:15:24 -07:00
Jed Estep 409b7b1b0c Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev am: 761653a4ad 
am: 3f581f7828

* commit '3f581f782883f011e3b63c5f9086e09f3762db35':
  Port applypatch.sh tests to recovery_component_tests
 2016-03-12 02:50:53 +00:00
Jed Estep 3f581f7828 Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev 
am: 761653a4ad

* commit '761653a4ad1c392fcd505e8909661fd64f02ce97':
  Port applypatch.sh tests to recovery_component_tests
 2016-03-12 02:48:57 +00:00
Jed Estep 761653a4ad Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev 2016-03-12 02:44:26 +00:00
Jed Estep b8a693bbc7 Port applypatch.sh tests to recovery_component_tests 
Bug: 27135282
Change-Id: If53682b591397ddfdb84860a3779b612904d4489
 2016-03-11 18:37:34 -08:00
Prashant Malani 8f4f11179a Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev am: 20df4adead 
am: 8dcd014951

* commit '8dcd0149514830f8b73101d83c9eb3368acab340':
  recovery: Remove SetColor, and other refactoring for WearUI
 2016-03-12 01:42:30 +00:00
Prashant Malani 8dcd014951 Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev 
am: 20df4adead

* commit '20df4adead04f5a137cce868c6b8024794d47fc0':
  recovery: Remove SetColor, and other refactoring for WearUI
 2016-03-12 00:39:48 +00:00
Prashant Malani 20df4adead Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev 2016-03-12 00:36:33 +00:00
Yabin Cui 42cfba5427 applypatch: use vector to store data in FileContents. am: 1c522df25f -s ours 
am: a0b8dc7aa6

* commit 'a0b8dc7aa6748ed05b05046f68afbc1b4d442904':
  applypatch: use vector to store data in FileContents.
 2016-03-11 23:41:08 +00:00
Yabin Cui a0b8dc7aa6 applypatch: use vector to store data in FileContents. 
am: 1c522df25f  -s ours

* commit '1c522df25f9524eaa0273538b3de0b9ad1b8fcea':
  applypatch: use vector to store data in FileContents.
 2016-03-11 23:38:56 +00:00
Prashant Malani 7a491225bb recovery: Remove SetColor, and other refactoring for WearUI 
The only difference from SetColor in ScreenRecoveryUI is the that the
LOG messages have slightly different colors. That's not enough to
warrant a duplicate function. So this patch removes SetColor and uses
the parent class version.

This patch also moves the DrawTextLine* functions into ScreenRecoveryUI
since they're mostly the same. It also moves char_width and char_height
into the class instead of keeping them as static variables.

Bug: 27407422
Change-Id: I30428c9433baab8410cf710a01c9b1c44c217bf1
 2016-03-11 15:22:20 -08:00
Yabin Cui 1c522df25f applypatch: use vector to store data in FileContents. 
Cherry pick this patch because it fixes the problem that
a newed Value is released by free().

Bug: 26906416
Change-Id: Ib53b445cd415a1ed5e95733fbc4073f9ef4dbc43
(cherry picked from commit d6c93afcc2)
 2016-03-11 11:11:11 -08:00
Prashant Malani d755057c91 recovery: Remove duplicate variables and functions am: 0ba21cff07 
am: 749054e1e3

* commit '749054e1e34272fc7ed987bfc2f4e24e8b9565ac':
  recovery: Remove duplicate variables and functions
 2016-03-11 19:07:38 +00:00
Prashant Malani 749054e1e3 recovery: Remove duplicate variables and functions 
am: 0ba21cff07

* commit '0ba21cff07ceafeaa43e17aa26e341d961f6f29f':
  recovery: Remove duplicate variables and functions
 2016-03-11 18:31:00 +00:00
Prashant Malani 0ba21cff07 recovery: Remove duplicate variables and functions 
The function that modifies rtl_locale exists only in the base class,
and so the variable should not have a duplicate in the derived class,
otherwise there may be incosistent values when it is read by the derived
class (the thinking being that invoking the function will modify the
base class version of the variable, and not the derived class version).

Remove the updateMutex variable, and instead re-use the one in the base
class.

Also remove LoadBitmap from WearUI since it is identical to the one in
ScreenRecoveryUI.

Bug: 27407422
Change-Id: Idd823fa93dfa16d7b2c9c7160f8d0c2559d28731
 2016-03-10 15:36:31 -08:00
Tianjie Xu 6086f4d18f Merge "Reboot and retry on I/O errors" into nyc-dev am: d345de66ef -s ours 
am: 3f004e03e5

* commit '3f004e03e59f7efc8c2ea0a6ec682ca0054c5c0b':
  Reboot and retry on I/O errors
 2016-03-10 22:18:05 +00:00
Tianjie Xu 3f004e03e5 Merge "Reboot and retry on I/O errors" into nyc-dev 
am: d345de66ef  -s ours

* commit 'd345de66efb919e8c0d09ee5b4d8ae0d443d6c94':
  Reboot and retry on I/O errors
 2016-03-10 22:13:05 +00:00
Tianjie Xu d345de66ef Merge "Reboot and retry on I/O errors" into nyc-dev 2016-03-10 21:27:26 +00:00
Tianjie Xu fa12b9737d Reboot and retry on I/O errors 
When I/O error happens, reboot and retry installation two times
before we abort this OTA update.

Bug: 25633753
Change-Id: Iba6d4203a343a725aa625a41d237606980d62f69
(cherry picked from commit 3c62b67faf)
 2016-03-10 11:50:28 -08:00
Prashant Malani 0eb5c48514 Revert "recovery: More refactoring of WearUI" am: f7f9e50528 
am: 46c7756b1a

* commit '46c7756b1a4b6f934eee6ec52483eacd6c34354d':
  Revert "recovery: More refactoring of WearUI"
 2016-03-10 19:14:00 +00:00
Prashant Malani 46c7756b1a Revert "recovery: More refactoring of WearUI" 
am: f7f9e50528

* commit 'f7f9e50528761022989c4f0cac6a92716b54674f':
  Revert "recovery: More refactoring of WearUI"
 2016-03-10 19:11:43 +00:00
Prashant Malani f7f9e50528 Revert "recovery: More refactoring of WearUI" 
This reverts commit 1c7b2230d8.

This change can lead to the derived class indirectly (and incorrectly) calling some functions from the base class, which can lead to unpredictable behavior.

Bug: 27407422
Change-Id: I126a7489b0787dc195e942e2ceea6769de20d70c
 2016-03-10 03:40:20 +00:00
Prashant Malani 63ccf7c4dc recovery: More refactoring of WearUI am: 1c7b2230d8 
am: fa623c60d4

* commit 'fa623c60d472340c46e63603ce8f1b192f332e15':
  recovery: More refactoring of WearUI
 2016-03-09 18:20:31 +00:00
Prashant Malani fa623c60d4 recovery: More refactoring of WearUI 
am: 1c7b2230d8

* commit '1c7b2230d8aac9f064f68c48b6aa26aca000cc9d':
  recovery: More refactoring of WearUI
 2016-03-09 18:16:34 +00:00
Sen Jiang f0b7ec7b3a Merge "applypatch: add -fPIC for libimgpatch in Chrome OS." am: 5593342575 
am: db78de25c2

* commit 'db78de25c2dfe0657c2b3408a5f9f5a587931cff':
  applypatch: add -fPIC for libimgpatch in Chrome OS.
 2016-03-09 01:37:30 +00:00
Sen Jiang db78de25c2 Merge "applypatch: add -fPIC for libimgpatch in Chrome OS." 
am: 5593342575

* commit '5593342575323f5f10e7af669871627e4ada8c7b':
  applypatch: add -fPIC for libimgpatch in Chrome OS.
 2016-03-09 01:35:41 +00:00
Sen Jiang 5593342575 Merge "applypatch: add -fPIC for libimgpatch in Chrome OS." 2016-03-09 01:28:09 +00:00
Sen Jiang ef2016f711 applypatch: add -fPIC for libimgpatch in Chrome OS. 
To make the static library position independent.

Bug: 26866274
Test: emerge-peppy imgdiff; sudo emerge imgdiff; emerge nyan imgdiff

Change-Id: I319e721ccfb6a51f63d31afa49f54aa7f607f4bf
 2016-03-08 17:02:50 -08:00
Prashant Malani b2085d9ce2 recovery: Begin refactor of WearUI to use ScreenRecoveryUI am: 7d9fd96dc9 
am: 5819944b16

* commit '5819944b165bcaff181af962c87be37f95e4d346':
  recovery: Begin refactor of WearUI to use ScreenRecoveryUI
 2016-03-09 00:41:54 +00:00
Prashant Malani 5819944b16 recovery: Begin refactor of WearUI to use ScreenRecoveryUI 
am: 7d9fd96dc9

* commit '7d9fd96dc99a6008979811e36bb06f3afad18508':
  recovery: Begin refactor of WearUI to use ScreenRecoveryUI
 2016-03-09 00:30:03 +00:00
Prashant Malani 1c7b2230d8 recovery: More refactoring of WearUI 
This patch performs the following modifications:
- Remove setBackground function, and currentIcon member variable.
- Remove common Progress*, Redraw and EndMenu functions.

Bug: 27407422
Change-Id: Ic3c0e16b67941484c3bc1d04c9b61288e8896808
Signed-off-by: Prashant Malani <pmalani@google.com>
 2016-03-08 15:56:54 -08:00
Prashant Malani 7d9fd96dc9 recovery: Begin refactor of WearUI to use ScreenRecoveryUI 
This is the first of a series of changes which move WearUI to subclass
ScreenRecoveryUI, to take advantage of several functions which are
common between the two recovery UI implementations, and already defined
in ScreenRecoveryUI.

This patch changes the base class of WearUI, removes redundant
header includes, and also removes a common function.

Bug: 27407422

Change-Id: I8fd90826900f69272a82e23bd099790e8004d511
 2016-03-08 14:37:49 -08:00
Tianjie Xu 6289e79532 Merge "Reboot and retry on I/O errors" am: 94dc34148c am: 90f01a4203 
am: 9a83ca02a3

* commit '9a83ca02a32a21f00c7328269ab2c05940928452':
  Reboot and retry on I/O errors
 2016-03-08 07:47:05 +00:00
Tianjie Xu 9a83ca02a3 Merge "Reboot and retry on I/O errors" am: 94dc34148c 
am: 90f01a4203

* commit '90f01a4203de453a2c6b940c39289b629ae3b654':
  Reboot and retry on I/O errors
 2016-03-08 07:44:47 +00:00
Tianjie Xu 90f01a4203 Merge "Reboot and retry on I/O errors" 
am: 94dc34148c

* commit '94dc34148c117fd3cfb442a348a69dbbb676a5c5':
  Reboot and retry on I/O errors
 2016-03-07 23:57:03 +00:00
Tianjie Xu 94dc34148c Merge "Reboot and retry on I/O errors" 2016-03-07 23:47:14 +00:00
Alex Deymo 8ab23ef210 Merge "Restore labels on /postinstall during recovery." into nyc-dev am: 1731f2980b 
am: a1ccc83c8b

* commit 'a1ccc83c8beb0a99b0453104deb6538c163a445f':
  Restore labels on /postinstall during recovery.
 2016-03-05 00:09:37 +00:00
Alex Deymo a1ccc83c8b Merge "Restore labels on /postinstall during recovery." into nyc-dev 
am: 1731f2980b

* commit '1731f2980bfadb29105ffd566dd78885889501d8':
  Restore labels on /postinstall during recovery.
 2016-03-05 00:07:37 +00:00
Alex Deymo 1731f2980b Merge "Restore labels on /postinstall during recovery." into nyc-dev 2016-03-05 00:03:47 +00:00
Alex Deymo 080f522fb9 Restore labels on /postinstall during recovery. 
This patch mirrors what was done in the main init.rc to relabel
/postinstall.

Bug: 27178350
Bug: 27177071

(cherry picked from commit 6bcc8af6e5)

Change-Id: I8320559f014cfb14216dcc350e016fc1db05cb14
 2016-03-04 15:50:27 -08:00
Tao Bao cdede8b0a4 recovery: Handle devices without /cache partition. am: ae6408d1a2 
am: d1e56b02e4

* commit 'd1e56b02e4f072d5100e2865948b721ea5bfa5b3':
  recovery: Handle devices without /cache partition.
 2016-03-04 20:32:52 +00:00
Tao Bao 0813c01c8b Merge "recovery: Handle devices without /cache partition." am: 479d9dc2f2 am: f2726712ea 
am: c36b919525

* commit 'c36b91952573dc632dfb855085a88303df583aab':
  recovery: Handle devices without /cache partition.
 2016-03-04 20:32:45 +00:00
Tao Bao 558a1942c5 Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." am: f639490a51 am: 038c294453 
am: d29a16afc7

* commit 'd29a16afc7918ee921a995950f31dd1d6be6823f':
  Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES.
 2016-03-04 20:32:38 +00:00
Tao Bao d1e56b02e4 recovery: Handle devices without /cache partition. 
am: ae6408d1a2

* commit 'ae6408d1a2edc9950a2bff3af448cddecc7adf13':
  recovery: Handle devices without /cache partition.
 2016-03-04 20:29:06 +00:00
Tao Bao c36b919525 Merge "recovery: Handle devices without /cache partition." am: 479d9dc2f2 
am: f2726712ea

* commit 'f2726712ea1e02fdabf595ece1cfeab9a6147386':
  recovery: Handle devices without /cache partition.
 2016-03-04 20:28:38 +00:00
Tao Bao d29a16afc7 Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." am: f639490a51 
am: 038c294453

* commit '038c294453865161680777f08ce7adbf42d8f6e3':
  Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES.
 2016-03-04 20:28:30 +00:00
Tao Bao f2726712ea Merge "recovery: Handle devices without /cache partition." 
am: 479d9dc2f2

* commit '479d9dc2f2601f5858726913e82aac69c1aa22d2':
  recovery: Handle devices without /cache partition.
 2016-03-04 20:26:06 +00:00