Snap for 5240105 from 2f216f3993 to qt-release

Change-Id: Iffc8e0b10120c7f329e85e8f0dd3d727c817d86d
This commit is contained in:
android-build-team Robot
2019-01-17 17:05:08 +00:00
2 changed files with 2 additions and 10 deletions
-8
View File
@@ -63,14 +63,6 @@ LOCAL_REQUIRED_MODULES += \
endif
endif
# e2fsck is needed for adb remount -R.
ifeq ($(BOARD_EXT4_SHARE_DUP_BLOCKS),true)
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
LOCAL_REQUIRED_MODULES += \
e2fsck_static
endif
endif
# On A/B devices recovery-persist reads the recovery related file from the persist storage and
# copies them into /data/misc/recovery. Then, for both A/B and non-A/B devices, recovery-persist
# parses the last_install file and reports the embedded update metrics. Also, the last_install file
+2 -2
View File
@@ -278,12 +278,12 @@ bool GraphicMenu::Validate(size_t max_width, size_t max_height, const GRSurface*
bool GraphicMenu::ValidateGraphicSurface(size_t max_width, size_t max_height, int y,
const GRSurface* surface) {
if (!surface) {
fprintf(stderr, "Graphic surface can not be null");
fprintf(stderr, "Graphic surface can not be null\n");
return false;
}
if (surface->pixel_bytes != 1 || surface->width != surface->row_bytes) {
fprintf(stderr, "Invalid graphic surface, pixel bytes: %zu, width: %zu row_bytes: %zu",
fprintf(stderr, "Invalid graphic surface, pixel bytes: %zu, width: %zu row_bytes: %zu\n",
surface->pixel_bytes, surface->width, surface->row_bytes);
return false;
}