am: 6f44637
* commit '6f446373fdda9e084e7cce86c4694f365e75951b':
Revert "DO NOT MERGE Control fault injection with config files instead of build flags"
All fonts were extracted to /tmp/extract.bin which was deleted after
the initial load, so reloading for scaling failed.
- extract fonts to /tmp with original name and don't delete them
- minor code cleanup
Change-Id: If8a0f657a7ef4c418fd5cc8550a24de44a38f303
flash_image was spitting an error. We are also specifying a size
so that we do not risk writing beyond the partition.
Change-Id: Ie3a0d77db96e54357238595934c3df0e3b680823
Individual files have contained the GPLv3 notice, but now the main
NOTICE file will indicate GPLv3 to better reflect the license of
the project.
Change-Id: I277b88e5853b7a7fc64f2305a5d4a3fff4e88e7d
The applypatch heaaders were recently moved to the include/ directory.
This patch reflects that change in the Makefile.
Bug: None
TEST=sudo emerge imgdiff
Change-Id: I0bf3f991b5e0c98054033c5939ed69b3e3c827a9
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
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
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)
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
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)
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
To make the static library position independent.
Bug: 26866274
Test: emerge-peppy imgdiff; sudo emerge imgdiff; emerge nyan imgdiff
Change-Id: I319e721ccfb6a51f63d31afa49f54aa7f607f4bf
Tao Bao
Ethan Yonker
that
Jed Estep
Elliott Hughes
The Android Automerger
Alex Deymo
Greg Kaiser
Prashant Malani
Yabin Cui
Tianjie Xu
Sen Jiang