diff options
-rw-r--r-- | README.md | 19 | ||||
-rw-r--r-- | minui/graphics_adf.h | 5 | ||||
-rw-r--r-- | minui/graphics_drm.h | 4 | ||||
-rw-r--r-- | minui/graphics_fbdev.cpp | 6 | ||||
-rw-r--r-- | minui/graphics_fbdev.h | 5 | ||||
-rw-r--r-- | minui/include/minui/minui.h | 25 | ||||
-rw-r--r-- | minui/resources.cpp | 22 | ||||
-rw-r--r-- | roots.cpp | 10 | ||||
-rw-r--r-- | screen_ui.cpp | 4 | ||||
-rw-r--r-- | tests/testdata/battery_scale.png | bin | 0 -> 463 bytes | |||
-rw-r--r-- | tests/unit/minui_test.cpp | 32 | ||||
-rw-r--r-- | tests/unit/resources_test.cpp | 37 | ||||
-rw-r--r-- | tests/unit/screen_ui_test.cpp | 6 | ||||
-rw-r--r-- | tools/image_generator/Android.bp | 1 | ||||
-rw-r--r-- | tools/image_generator/ImageGenerator.java | 86 | ||||
-rw-r--r-- | updater/install.cpp | 6 |
16 files changed, 148 insertions, 120 deletions
@@ -41,13 +41,6 @@ Running the manual tests contents of pmsg buffer into /data/misc/recovery/inject.txt. Test will pass if this file has expected contents. -`ResourceTest` validates whether the png files are qualified as background text -image under recovery. - - 1. `adb sync data` to make sure the test-dir has the images to test. - 2. The test will automatically pickup and verify all `_text.png` files in - the test dir. - Using `adb` under recovery -------------------------- @@ -60,10 +53,10 @@ allows `adb` communication. A device should be listed under `adb devices`, eithe List of devices attached 1234567890abcdef recovery -Although `/sbin/adbd` shares the same binary between normal boot and recovery images, only a subset -of `adb` commands are meaningful under recovery, such as `adb root`, `adb shell`, `adb push`, `adb -pull` etc. `adb shell` works only after manually mounting `/system` from recovery menu (assuming a -valid system image on device). +Although `/system/bin/adbd` is built from the same code base as the one in the normal boot, only a +subset of `adb` commands are meaningful under recovery, such as `adb root`, `adb shell`, `adb push`, +`adb pull` etc. Since Android Q, `adb shell` no longer requires manually mounting `/system` from +recovery menu. ## Troubleshooting @@ -74,8 +67,8 @@ valid system image on device). * Ensure `adbd` is built and running. -By default, `adbd` is always included into recovery image, as `/sbin/adbd`. `init` starts `adbd` -service automatically only in debuggable builds. This behavior is controlled by the recovery +By default, `adbd` is always included into recovery image, as `/system/bin/adbd`. `init` starts +`adbd` service automatically only in debuggable builds. This behavior is controlled by the recovery specific `/init.rc`, whose source code is at `bootable/recovery/etc/init.rc`. The best way to confirm a running `adbd` is by checking the serial output, which shows a service diff --git a/minui/graphics_adf.h b/minui/graphics_adf.h index bf9842878..79d8d2acb 100644 --- a/minui/graphics_adf.h +++ b/minui/graphics_adf.h @@ -16,6 +16,7 @@ #pragma once +#include <stddef.h> #include <stdint.h> #include <sys/types.h> @@ -40,8 +41,8 @@ class GRSurfaceAdf : public GRSurface { private: friend class MinuiBackendAdf; - GRSurfaceAdf(int width, int height, int row_bytes, int pixel_bytes, __u32 offset, __u32 pitch, - int fd) + GRSurfaceAdf(size_t width, size_t height, size_t row_bytes, size_t pixel_bytes, __u32 offset, + __u32 pitch, int fd) : GRSurface(width, height, row_bytes, pixel_bytes), offset(offset), pitch(pitch), fd(fd) {} const __u32 offset; diff --git a/minui/graphics_drm.h b/minui/graphics_drm.h index 6ba46e60b..57ba39b83 100644 --- a/minui/graphics_drm.h +++ b/minui/graphics_drm.h @@ -16,6 +16,7 @@ #pragma once +#include <stddef.h> #include <stdint.h> #include <memory> @@ -39,7 +40,8 @@ class GRSurfaceDrm : public GRSurface { private: friend class MinuiBackendDrm; - GRSurfaceDrm(int width, int height, int row_bytes, int pixel_bytes, int drm_fd, uint32_t handle) + GRSurfaceDrm(size_t width, size_t height, size_t row_bytes, size_t pixel_bytes, int drm_fd, + uint32_t handle) : GRSurface(width, height, row_bytes, pixel_bytes), drm_fd_(drm_fd), handle(handle) {} const int drm_fd_; diff --git a/minui/graphics_fbdev.cpp b/minui/graphics_fbdev.cpp index 93e4420d3..8d9c9741d 100644 --- a/minui/graphics_fbdev.cpp +++ b/minui/graphics_fbdev.cpp @@ -32,8 +32,8 @@ #include "minui/minui.h" -std::unique_ptr<GRSurfaceFbdev> GRSurfaceFbdev::Create(int width, int height, int row_bytes, - int pixel_bytes) { +std::unique_ptr<GRSurfaceFbdev> GRSurfaceFbdev::Create(size_t width, size_t height, + size_t row_bytes, size_t pixel_bytes) { // Cannot use std::make_unique to access non-public ctor. return std::unique_ptr<GRSurfaceFbdev>(new GRSurfaceFbdev(width, height, row_bytes, pixel_bytes)); } @@ -130,7 +130,7 @@ GRSurface* MinuiBackendFbdev::Init() { fb_fd = std::move(fd); SetDisplayedFramebuffer(0); - printf("framebuffer: %d (%d x %d)\n", fb_fd.get(), gr_draw->width, gr_draw->height); + printf("framebuffer: %d (%zu x %zu)\n", fb_fd.get(), gr_draw->width, gr_draw->height); Blank(true); Blank(false); diff --git a/minui/graphics_fbdev.h b/minui/graphics_fbdev.h index 016ab88bc..596ba74ea 100644 --- a/minui/graphics_fbdev.h +++ b/minui/graphics_fbdev.h @@ -17,6 +17,7 @@ #pragma once #include <linux/fb.h> +#include <stddef.h> #include <stdint.h> #include <memory> @@ -30,8 +31,8 @@ class GRSurfaceFbdev : public GRSurface { public: // Creates and returns a GRSurfaceFbdev instance, or nullptr on error. - static std::unique_ptr<GRSurfaceFbdev> Create(int width, int height, int row_bytes, - int pixel_bytes); + static std::unique_ptr<GRSurfaceFbdev> Create(size_t width, size_t height, size_t row_bytes, + size_t pixel_bytes); uint8_t* data() override { return buffer_; diff --git a/minui/include/minui/minui.h b/minui/include/minui/minui.h index 3231248a0..e49c6ac97 100644 --- a/minui/include/minui/minui.h +++ b/minui/include/minui/minui.h @@ -33,13 +33,16 @@ class GRSurface { public: + static constexpr size_t kSurfaceDataAlignment = 8; + virtual ~GRSurface() = default; // Creates and returns a GRSurface instance that's sufficient for storing an image of the given - // size. The starting address of the surface data is aligned to SURFACE_DATA_ALIGNMENT. Returns - // the created GRSurface instance (in std::unique_ptr), or nullptr on error. - static std::unique_ptr<GRSurface> Create(int width, int height, int row_bytes, int pixel_bytes, - size_t data_size); + // size (i.e. row_bytes * height). The starting address of the surface data is aligned to + // kSurfaceDataAlignment. Returns the created GRSurface instance (in std::unique_ptr), or nullptr + // on error. + static std::unique_ptr<GRSurface> Create(size_t width, size_t height, size_t row_bytes, + size_t pixel_bytes); // Clones the current GRSurface instance (i.e. an image). std::unique_ptr<GRSurface> Clone() const; @@ -52,13 +55,17 @@ class GRSurface { return const_cast<const uint8_t*>(const_cast<GRSurface*>(this)->data()); } - int width; - int height; - int row_bytes; - int pixel_bytes; + size_t data_size() const { + return data_size_; + } + + size_t width; + size_t height; + size_t row_bytes; + size_t pixel_bytes; protected: - GRSurface(int width, int height, int row_bytes, int pixel_bytes) + GRSurface(size_t width, size_t height, size_t row_bytes, size_t pixel_bytes) : width(width), height(height), row_bytes(row_bytes), pixel_bytes(pixel_bytes) {} private: diff --git a/minui/resources.cpp b/minui/resources.cpp index c7af1904d..069a49529 100644 --- a/minui/resources.cpp +++ b/minui/resources.cpp @@ -27,6 +27,7 @@ #include <sys/types.h> #include <unistd.h> +#include <limits> #include <memory> #include <regex> #include <string> @@ -39,11 +40,14 @@ static std::string g_resource_dir{ "/res/images" }; -std::unique_ptr<GRSurface> GRSurface::Create(int width, int height, int row_bytes, int pixel_bytes, - size_t data_size) { - static constexpr size_t kSurfaceDataAlignment = 8; +std::unique_ptr<GRSurface> GRSurface::Create(size_t width, size_t height, size_t row_bytes, + size_t pixel_bytes) { + if (width == 0 || row_bytes == 0 || height == 0 || pixel_bytes == 0) return nullptr; + if (std::numeric_limits<size_t>::max() / row_bytes < height) return nullptr; + // Cannot use std::make_unique to access non-public ctor. auto result = std::unique_ptr<GRSurface>(new GRSurface(width, height, row_bytes, pixel_bytes)); + size_t data_size = row_bytes * height; result->data_size_ = (data_size + kSurfaceDataAlignment - 1) / kSurfaceDataAlignment * kSurfaceDataAlignment; result->data_.reset( @@ -53,7 +57,7 @@ std::unique_ptr<GRSurface> GRSurface::Create(int width, int height, int row_byte } std::unique_ptr<GRSurface> GRSurface::Clone() const { - auto result = GRSurface::Create(width, height, row_bytes, pixel_bytes, data_size_); + auto result = GRSurface::Create(width, height, row_bytes, pixel_bytes); if (!result) return nullptr; memcpy(result->data(), data(), data_size_); return result; @@ -189,7 +193,7 @@ int res_create_display_surface(const char* name, GRSurface** pSurface) { png_uint_32 width = png_handler.width(); png_uint_32 height = png_handler.height(); - auto surface = GRSurface::Create(width, height, width * 4, 4, width * height * 4); + auto surface = GRSurface::Create(width, height, width * 4, 4); if (!surface) { return -8; } @@ -259,9 +263,7 @@ int res_create_multi_display_surface(const char* name, int* frames, int* fps, goto exit; } for (int i = 0; i < *frames; ++i) { - auto height_per_frame = height / *frames; - auto created_surface = - GRSurface::Create(width, height_per_frame, width * 4, 4, width * height_per_frame); + auto created_surface = GRSurface::Create(width, height / *frames, width * 4, 4); if (!created_surface) { result = -8; goto exit; @@ -309,7 +311,7 @@ int res_create_alpha_surface(const char* name, GRSurface** pSurface) { png_uint_32 width = png_handler.width(); png_uint_32 height = png_handler.height(); - auto surface = GRSurface::Create(width, height, width, 1, width * height); + auto surface = GRSurface::Create(width, height, width, 1); if (!surface) { return -8; } @@ -415,7 +417,7 @@ int res_create_localized_alpha_surface(const char* name, if (y + 1 + h >= height || matches_locale(loc, locale)) { printf(" %20s: %s (%d x %d @ %d)\n", name, loc, w, h, y); - auto surface = GRSurface::Create(w, h, w, 1, w * h); + auto surface = GRSurface::Create(w, h, w, 1); if (!surface) { return -8; } @@ -18,6 +18,7 @@ #include <ctype.h> #include <fcntl.h> +#include <inttypes.h> #include <stdint.h> #include <stdlib.h> #include <string.h> @@ -67,7 +68,7 @@ void load_volume_table() { printf("=========================\n"); for (int i = 0; i < fstab->num_entries; ++i) { const Volume* v = &fstab->recs[i]; - printf(" %d %s %s %s %lld\n", i, v->mount_point, v->fs_type, v->blk_device, v->length); + printf(" %d %s %s %s %" PRId64 "\n", i, v->mount_point, v->fs_type, v->blk_device, v->length); } printf("\n"); } @@ -345,12 +346,7 @@ int format_volume(const char* volume, const char* directory) { // clang-format off std::vector<std::string> make_f2fs_cmd = { cmd, - "-d1", - "-f", - "-O", "encrypt", - "-O", "quota", - "-O", "verity", - "-w", std::to_string(kSectorSize), + "-g", "android", v->blk_device, }; // clang-format on diff --git a/screen_ui.cpp b/screen_ui.cpp index ed71888d1..765d2fe60 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp @@ -282,14 +282,14 @@ bool GraphicMenu::ValidateGraphicSurface(size_t max_width, size_t max_height, in } if (surface->pixel_bytes != 1 || surface->width != surface->row_bytes) { - fprintf(stderr, "Invalid graphic surface, pixel bytes: %d, width: %d row_bytes: %d", + fprintf(stderr, "Invalid graphic surface, pixel bytes: %zu, width: %zu row_bytes: %zu", surface->pixel_bytes, surface->width, surface->row_bytes); return false; } if (surface->width > max_width || surface->height > max_height - y) { fprintf(stderr, - "Graphic surface doesn't fit into the screen. width: %d, height: %d, max_width: %zu," + "Graphic surface doesn't fit into the screen. width: %zu, height: %zu, max_width: %zu," " max_height: %zu, vertical offset: %d\n", surface->width, surface->height, max_width, max_height, y); return false; diff --git a/tests/testdata/battery_scale.png b/tests/testdata/battery_scale.png Binary files differnew file mode 100644 index 000000000..2ae8f0fd7 --- /dev/null +++ b/tests/testdata/battery_scale.png diff --git a/tests/unit/minui_test.cpp b/tests/unit/minui_test.cpp index d68e5e3a1..c7d7f7eef 100644 --- a/tests/unit/minui_test.cpp +++ b/tests/unit/minui_test.cpp @@ -17,6 +17,7 @@ #include <stdint.h> #include <stdlib.h> +#include <limits> #include <vector> #include <gtest/gtest.h> @@ -24,21 +25,30 @@ #include "minui/minui.h" TEST(GRSurfaceTest, Create_aligned) { - static constexpr size_t kSurfaceDataAlignment = 8; - for (size_t data_size = 100; data_size < 128; data_size++) { - auto surface = GRSurface::Create(10, 1, 10, 1, data_size); - ASSERT_TRUE(surface); - ASSERT_EQ(0, reinterpret_cast<uintptr_t>(surface->data()) % kSurfaceDataAlignment); - } + auto surface = GRSurface::Create(9, 11, 9, 1); + ASSERT_TRUE(surface); + ASSERT_EQ(0, reinterpret_cast<uintptr_t>(surface->data()) % GRSurface::kSurfaceDataAlignment); + // data_size will be rounded up to the next multiple of GRSurface::kSurfaceDataAlignment. + ASSERT_EQ(0, surface->data_size() % GRSurface::kSurfaceDataAlignment); + ASSERT_GE(surface->data_size(), 11 * 9); +} + +TEST(GRSurfaceTest, Create_invalid_inputs) { + ASSERT_FALSE(GRSurface::Create(9, 11, 0, 1)); + ASSERT_FALSE(GRSurface::Create(9, 0, 9, 1)); + ASSERT_FALSE(GRSurface::Create(0, 11, 9, 1)); + ASSERT_FALSE(GRSurface::Create(9, 11, 9, 0)); + ASSERT_FALSE(GRSurface::Create(9, 101, std::numeric_limits<size_t>::max() / 100, 1)); } TEST(GRSurfaceTest, Clone) { - static constexpr size_t kImageSize = 10 * 50; - auto image = GRSurface::Create(50, 10, 50, 1, kImageSize); - for (auto i = 0; i < kImageSize; i++) { + auto image = GRSurface::Create(50, 10, 50, 1); + ASSERT_GE(image->data_size(), 10 * 50); + for (auto i = 0; i < image->data_size(); i++) { image->data()[i] = rand() % 128; } auto image_copy = image->Clone(); - ASSERT_EQ(std::vector(image->data(), image->data() + kImageSize), - std::vector(image_copy->data(), image_copy->data() + kImageSize)); + ASSERT_EQ(image->data_size(), image_copy->data_size()); + ASSERT_EQ(std::vector(image->data(), image->data() + image->data_size()), + std::vector(image_copy->data(), image_copy->data() + image->data_size())); } diff --git a/tests/unit/resources_test.cpp b/tests/unit/resources_test.cpp new file mode 100644 index 000000000..c3f72718f --- /dev/null +++ b/tests/unit/resources_test.cpp @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <string> + +#include <gtest/gtest.h> + +#include "common/test_constants.h" +#include "minui/minui.h" + +TEST(ResourcesTest, res_create_multi_display_surface) { + GRSurface** frames; + int frame_count; + int fps; + ASSERT_EQ(0, res_create_multi_display_surface(from_testdata_base("battery_scale.png").c_str(), + &frame_count, &fps, &frames)); + ASSERT_EQ(6, frame_count); + ASSERT_EQ(20, fps); + + for (auto i = 0; i < frame_count; i++) { + free(frames[i]); + } + free(frames); +} diff --git a/tests/unit/screen_ui_test.cpp b/tests/unit/screen_ui_test.cpp index 09c49977f..61a092551 100644 --- a/tests/unit/screen_ui_test.cpp +++ b/tests/unit/screen_ui_test.cpp @@ -231,7 +231,7 @@ TEST_F(ScreenUITest, WearMenuSelectItemsOverflow) { } TEST_F(ScreenUITest, GraphicMenuSelection) { - auto image = GRSurface::Create(50, 50, 50, 1, 50 * 50); + auto image = GRSurface::Create(50, 50, 50, 1); auto header = image->Clone(); std::vector<const GRSurface*> items = { image.get(), @@ -258,7 +258,7 @@ TEST_F(ScreenUITest, GraphicMenuSelection) { } TEST_F(ScreenUITest, GraphicMenuValidate) { - auto image = GRSurface::Create(50, 50, 50, 1, 50 * 50); + auto image = GRSurface::Create(50, 50, 50, 1); auto header = image->Clone(); std::vector<const GRSurface*> items = { image.get(), @@ -269,7 +269,7 @@ TEST_F(ScreenUITest, GraphicMenuValidate) { ASSERT_TRUE(GraphicMenu::Validate(200, 200, header.get(), items)); // Menu exceeds the horizontal boundary. - auto wide_surface = GRSurface::Create(300, 50, 300, 1, 300 * 50); + auto wide_surface = GRSurface::Create(300, 50, 300, 1); ASSERT_FALSE(GraphicMenu::Validate(299, 200, wide_surface.get(), items)); // Menu exceeds the vertical boundary. diff --git a/tools/image_generator/Android.bp b/tools/image_generator/Android.bp index ce6e277bc..2afdd5a84 100644 --- a/tools/image_generator/Android.bp +++ b/tools/image_generator/Android.bp @@ -19,6 +19,7 @@ java_library_host { static_libs: [ "commons-cli-1.2", + "icu4j-host", ], srcs: [ diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java index 9d882678a..50a498456 100644 --- a/tools/image_generator/ImageGenerator.java +++ b/tools/image_generator/ImageGenerator.java @@ -16,6 +16,8 @@ package com.android.recovery.tools; +import com.ibm.icu.text.BreakIterator; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.GnuParser; import org.apache.commons.cli.HelpFormatter; @@ -44,7 +46,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; -import java.util.StringTokenizer; import java.util.TreeMap; import java.util.logging.Level; import java.util.logging.Logger; @@ -91,7 +92,7 @@ public class ImageGenerator { // Some localized font cannot draw the word "Android" and some PUNCTUATIONS; we need to fall // back to use our default latin font instead. - private static final char[] PUNCTUATIONS = {',', ';', '.', '!' }; + private static final char[] PUNCTUATIONS = {',', ';', '.', '!', '?'}; private static final String ANDROID_STRING = "Android"; @@ -153,22 +154,6 @@ public class ImageGenerator { } }; - // Languages that breaks on arbitrary characters. - // TODO(xunchang) switch to icu library if possible. For example, for Thai and Khmer, there is - // no space between words; and word breaking is based on grammatical analysis and on word - // matching in dictionaries. - private static final Set<String> LOGOGRAM_LANGUAGE = - new HashSet<String>() { - { - add("ja"); // Japanese - add("km"); // Khmer - add("ko"); // Korean - add("lo"); // Lao - add("th"); // Thai - add("zh"); // Chinese - } - }; - /** Exception to indicate the failure to find the translated text strings. */ public static class LocalizedStringNotFoundException extends Exception { public LocalizedStringNotFoundException(String message) { @@ -229,8 +214,9 @@ public class ImageGenerator { index + ANDROID_STRING.length()); } - // Adds the attribute to use default font to draw the PUNCTUATIONS ", . !" + // Adds the attribute to use default font to draw the PUNCTUATIONS ", . ; ! ?" for (char punctuation : PUNCTUATIONS) { + // TODO (xunchang) handle the RTL language that has different directions for '?' if (text.indexOf(punctuation) != -1 && !textFont.canDisplay(punctuation)) { int index = 0; while ((index = text.indexOf(punctuation, index)) != -1) { @@ -244,6 +230,11 @@ public class ImageGenerator { mWrappedLines.add(new LineInfo(attributedText, width)); } + + /** Merges two WrappedTextInfo. */ + public void addLines(WrappedTextInfo other) { + mWrappedLines.addAll(other.mWrappedLines); + } } /** Initailizes the fields of the image image. */ @@ -408,16 +399,20 @@ public class ImageGenerator { "Can not find the font file " + fontName + " for language " + language); } - /** Separates the text string by spaces and wraps it by words. */ - private WrappedTextInfo wrapTextByWords(String text, FontMetrics metrics) { + /** Wraps the text with a maximum of mImageWidth pixels per line. */ + private WrappedTextInfo wrapText(String text, FontMetrics metrics) { WrappedTextInfo info = new WrappedTextInfo(); - StringTokenizer st = new StringTokenizer(text, " \n"); + + BreakIterator lineBoundary = BreakIterator.getLineInstance(); + lineBoundary.setText(text); int lineWidth = 0; // Width of the processed words of the current line. + int start = lineBoundary.first(); StringBuilder line = new StringBuilder(); - while (st.hasMoreTokens()) { - String token = st.nextToken(); - int tokenWidth = metrics.stringWidth(token + " "); + for (int end = lineBoundary.next(); end != BreakIterator.DONE; + start = end, end = lineBoundary.next()) { + String token = text.substring(start, end); + int tokenWidth = metrics.stringWidth(token); // Handles the width mismatch of the word "Android" between different fonts. if (token.contains(ANDROID_STRING) && metrics.getFont().canDisplayUpTo(ANDROID_STRING) != -1) { @@ -430,7 +425,7 @@ public class ImageGenerator { line = new StringBuilder(); lineWidth = 0; } - line.append(token).append(" "); + line.append(token); lineWidth += tokenWidth; } @@ -439,27 +434,9 @@ public class ImageGenerator { return info; } - /** One character is a word for CJK. */ - private WrappedTextInfo wrapTextByCharacters(String text, FontMetrics metrics) { - WrappedTextInfo info = new WrappedTextInfo(); - // TODO (xunchang) handle the text wrapping with logogram language mixed with latin. - StringBuilder line = new StringBuilder(); - for (char token : text.toCharArray()) { - if (metrics.stringWidth(line + Character.toString(token)) > mImageWidth) { - info.addLine(line.toString(), metrics.stringWidth(line.toString()), - metrics.getFont(), null); - line = new StringBuilder(); - } - line.append(token); - } - info.addLine(line.toString(), metrics.stringWidth(line.toString()), metrics.getFont(), - null); - - return info; - } - /** - * Wraps the text with a maximum of mImageWidth pixels per line. + * Handles the special characters of the raw text embedded in the xml file; and wraps the text + * with a maximum of mImageWidth pixels per line. * * @param text the string representation of text to wrap * @param metrics the metrics of the Font used to draw the text; it gives the width in pixels of @@ -467,12 +444,17 @@ public class ImageGenerator { * @return a WrappedTextInfo class with the width of each AttributedString smaller than * mImageWidth pixels */ - private WrappedTextInfo wrapText(String text, FontMetrics metrics, String language) { - if (LOGOGRAM_LANGUAGE.contains(language)) { - return wrapTextByCharacters(text, metrics); + private WrappedTextInfo processAndWrapText(String text, FontMetrics metrics) { + // Apostrophe is escaped in the xml file. + String processed = text.replace("\\'", "'"); + // The separator "\n\n" indicates a new line in the text. + String[] lines = processed.split("\\\\n\\\\n"); + WrappedTextInfo result = new WrappedTextInfo(); + for (String line : lines) { + result.addLines(wrapText(line, metrics)); } - return wrapTextByWords(text, metrics); + return result; } /** @@ -516,7 +498,7 @@ public class ImageGenerator { throws IOException, FontFormatException { Graphics2D graphics = createGraphics(locale); FontMetrics fontMetrics = graphics.getFontMetrics(); - WrappedTextInfo wrappedTextInfo = wrapText(text, fontMetrics, locale.getLanguage()); + WrappedTextInfo wrappedTextInfo = processAndWrapText(text, fontMetrics); int textWidth = 0; for (WrappedTextInfo.LineInfo lineInfo : wrappedTextInfo.mWrappedLines) { @@ -551,7 +533,7 @@ public class ImageGenerator { Graphics2D graphics = createGraphics(locale); FontMetrics fontMetrics = graphics.getFontMetrics(); - WrappedTextInfo wrappedTextInfo = wrapText(text, fontMetrics, locale.getLanguage()); + WrappedTextInfo wrappedTextInfo = processAndWrapText(text, fontMetrics); // Marks the start y offset for the text image of current locale; and reserves one line to // encode the image metadata. diff --git a/updater/install.cpp b/updater/install.cpp index deb7a2b02..ccde409df 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -484,11 +484,7 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt const char* f2fs_path = "/sbin/mkfs.f2fs"; const char* f2fs_argv[] = { "mkfs.f2fs", - "-d1", - "-f", - "-O", "encrypt", - "-O", "quota", - "-O", "verity", + "-g", "android", "-w", "512", location.c_str(), (size < 512) ? nullptr : num_sectors.c_str(), |