PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 5158715 from 84e9e60b0f to qt-release

Browse Source 
Change-Id: I89064ab6e468232168999383c0911d8e5de2a949
This commit is contained in:
android-build-team Robot
2018-12-02 04:14:38 +00:00
parent befaa118b9 84e9e60b0f
commit d24f5715bd
5 changed files with 67 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fsck_unshare_blocks.cpp
+4 -9
View File
@@ -40,7 +40,6 @@
static constexpr const char* SYSTEM_E2FSCK_BIN = "/system/bin/e2fsck_static";
static constexpr const char* TMP_E2FSCK_BIN = "/tmp/e2fsck.bin";
static constexpr const char* SYSTEM_ROOT = "/system";
static bool copy_file(const char* source, const char* dest) {
android::base::unique_fd source_fd(open(source, O_RDONLY));
@@ -121,14 +120,10 @@ bool do_fsck_unshare_blocks() {
std::vector<std::string> partitions = { "/odm", "/oem", "/product", "/vendor" };
// Temporarily mount system so we can copy e2fsck_static.
bool mounted = false;
if (volume_for_mount_point(SYSTEM_ROOT) == nullptr) {
mounted = ensure_path_mounted_at("/", "/mnt/system") != -1;
partitions.push_back("/");
} else {
mounted = ensure_path_mounted_at(SYSTEM_ROOT, "/mnt/system") != -1;
partitions.push_back(SYSTEM_ROOT);
}
std::string system_root = get_system_root();
bool mounted = ensure_path_mounted_at(system_root.c_str(), "/mnt/system") != -1;
partitions.push_back(system_root);
if (!mounted) {
LOG(ERROR) << "Failed to mount system image.";
return false;
recovery.cpp
+2 -9
View File
@@ -78,7 +78,6 @@ static constexpr const char* CACHE_ROOT = "/cache";
static constexpr const char* DATA_ROOT = "/data";
static constexpr const char* METADATA_ROOT = "/metadata";
static constexpr const char* SDCARD_ROOT = "/sdcard";
static constexpr const char* SYSTEM_ROOT = "/system";
// We define RECOVERY_API_VERSION in Android.mk, which will be picked up by build system and packed
// into target_files.zip. Assert the version defined in code and in Android.mk are consistent.
@@ -837,14 +836,8 @@ static Device::BuiltinAction prompt_and_wait(Device* device, int status) {
}
case Device::MOUNT_SYSTEM:
// the system partition is mounted at /mnt/system
if (volume_for_mount_point(SYSTEM_ROOT) == nullptr) {
if (ensure_path_mounted_at("/", "/mnt/system") != -1) {
ui->Print("Mounted /system.\n");
}
} else {
if (ensure_path_mounted_at(SYSTEM_ROOT, "/mnt/system") != -1) {
ui->Print("Mounted /system.\n");
}
if (ensure_path_mounted_at(get_system_root().c_str(), "/mnt/system") != -1) {
ui->Print("Mounted /system.\n");
}
break;
roots.cpp
+11 -1
View File
@@ -18,6 +18,7 @@
#include <ctype.h>
#include <fcntl.h>
#include <inttypes.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
@@ -44,6 +45,7 @@
static struct fstab* fstab = nullptr;
static bool did_map_logical_partitions = false;
static constexpr const char* SYSTEM_ROOT = "/system";
extern struct selabel_handle* sehandle;
@@ -66,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");
}
@@ -407,3 +409,11 @@ int setup_install_mounts() {
bool logical_partitions_mapped() {
return did_map_logical_partitions;
}
std::string get_system_root() {
if (volume_for_mount_point(SYSTEM_ROOT) == nullptr) {
return "/";
} else {
return SYSTEM_ROOT;
}
}
roots.h
+2
View File
@@ -55,4 +55,6 @@ int setup_install_mounts();
bool logical_partitions_mapped();
std::string get_system_root();
#endif // RECOVERY_ROOTS_H_
tools/image_generator/ImageGenerator.java
+48 -21
View File
@@ -41,6 +41,7 @@ import java.io.IOException;
import java.text.AttributedString;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
@@ -92,7 +93,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";
@@ -214,8 +215,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) {
@@ -229,6 +231,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. */
@@ -393,15 +400,7 @@ public class ImageGenerator {
"Can not find the font file " + fontName + " for language " + language);
}
/**
* 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
* the text given its string representation
* @return a WrappedTextInfo class with the width of each AttributedString smaller than
* mImageWidth pixels
*/
/** Wraps the text with a maximum of mImageWidth pixels per line. */
private WrappedTextInfo wrapText(String text, FontMetrics metrics) {
WrappedTextInfo info = new WrappedTextInfo();
@@ -436,6 +435,29 @@ public class ImageGenerator {
return info;
}
/**
* 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
* the text given its string representation
* @return a WrappedTextInfo class with the width of each AttributedString smaller than
* mImageWidth pixels
*/
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 result;
}
/**
* Encodes the information of the text image for |locale|. According to minui/resources.cpp, the
* width, height and locale of the image is decoded as: int w = (row[1] << 8) | row[0]; int h =
@@ -477,7 +499,7 @@ public class ImageGenerator {
throws IOException, FontFormatException {
Graphics2D graphics = createGraphics(locale);
FontMetrics fontMetrics = graphics.getFontMetrics();
WrappedTextInfo wrappedTextInfo = wrapText(text, fontMetrics);
WrappedTextInfo wrappedTextInfo = processAndWrapText(text, fontMetrics);
int textWidth = 0;
for (WrappedTextInfo.LineInfo lineInfo : wrappedTextInfo.mWrappedLines) {
@@ -512,7 +534,7 @@ public class ImageGenerator {
Graphics2D graphics = createGraphics(locale);
FontMetrics fontMetrics = graphics.getFontMetrics();
WrappedTextInfo wrappedTextInfo = wrapText(text, fontMetrics);
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.
@@ -584,11 +606,15 @@ public class ImageGenerator {
mDefaultFont = defaultFontMetrics.getFont();
mAndroidStringWidth = defaultFontMetrics.stringWidth(ANDROID_STRING);
Map<String, Integer> languageCount = new TreeMap<>();
// The last country variant should be the fallback locale for a given language.
Map<String, Locale> fallbackLocaleMap = new HashMap<>();
int textWidth = 0;
for (Locale locale : localizedTextMap.keySet()) {
String language = locale.getLanguage();
languageCount.put(language, languageCount.getOrDefault(language, 0) + 1);
// Updates the fallback locale if we have a new language variant. Don't do it for en-XC
// as it's a pseudo-locale.
if (!locale.toLanguageTag().equals("en-XC")) {
fallbackLocaleMap.put(locale.getLanguage(), locale);
}
textWidth = Math.max(textWidth, measureTextWidth(localizedTextMap.get(locale), locale));
}
@@ -596,15 +622,16 @@ public class ImageGenerator {
resize(textWidth, mImageHeight);
for (Locale locale : localizedTextMap.keySet()) {
Integer count = languageCount.get(locale.getLanguage());
// Recovery expects en-US instead of en_US.
String languageTag = locale.toLanguageTag();
if (count == 1) {
// Make the last country variant for a given language be the catch-all for that
Locale fallbackLocale = fallbackLocaleMap.get(locale.getLanguage());
if (locale.equals(fallbackLocale)) {
// Makes the last country variant for a given language be the catch-all for that
// language.
languageTag = locale.getLanguage();
} else {
languageCount.put(locale.getLanguage(), count - 1);
} else if (localizedTextMap.get(locale).equals(localizedTextMap.get(fallbackLocale))) {
LOGGER.info("Skip parsing text for duplicate locale " + locale);
continue;
}
drawText(localizedTextMap.get(locale), locale, languageTag);