Merge "Revert "Fix doing silent update,power cut/restoration,screen is turned on""
diff --git a/Android.bp b/Android.bp
index 4cdeba0..d713942 100644
--- a/Android.bp
+++ b/Android.bp
@@ -161,7 +161,7 @@
],
shared_libs: [
- "android.hardware.health-V1-ndk", // from librecovery_utils
+ "android.hardware.health-V2-ndk", // from librecovery_utils
"android.hardware.boot-V1-ndk",
"librecovery_ui",
],
diff --git a/install/install.cpp b/install/install.cpp
index 83f3cad..044856b 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -551,7 +551,9 @@
} else {
LOG(FATAL) << "Invalid status code " << status;
}
- PerformPowerwashIfRequired(zip, device);
+ if (package_is_ab) {
+ PerformPowerwashIfRequired(zip, device);
+ }
return INSTALL_SUCCESS;
}
diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index 9d3f733..c664d74 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -97,7 +97,7 @@
],
shared_libs: [
- "android.hardware.health-V1-ndk", // from librecovery_utils
+ "android.hardware.health-V2-ndk", // from librecovery_utils
"libbase",
"libcrypto",
],
@@ -129,7 +129,7 @@
],
static_libs: [
- "android.hardware.health-V1-ndk", // from librecovery_utils
+ "android.hardware.health-V2-ndk", // from librecovery_utils
"libminadbd_services",
"libfusesideload",
"librecovery_utils",
diff --git a/recovery_utils/Android.bp b/recovery_utils/Android.bp
index 9bd66c5..74392c5 100644
--- a/recovery_utils/Android.bp
+++ b/recovery_utils/Android.bp
@@ -75,11 +75,11 @@
shared_libs: [
// The following cannot be placed in librecovery_utils_defaults,
- // because at the time of writing, android.hardware.health-V1-ndk.so
+ // because at the time of writing, android.hardware.health-V2-ndk.so
// is not installed to the system image yet. (It is installed
// to the recovery ramdisk.) Hence, minadbd_test must link to it
// statically.
- "android.hardware.health-V1-ndk",
+ "android.hardware.health-V2-ndk",
],
export_include_dirs: [
diff --git a/tests/Android.bp b/tests/Android.bp
index 0708e85..b888d47 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -148,7 +148,7 @@
static_libs: libapplypatch_static_libs + librecovery_static_libs + [
"android.hardware.health-translate-ndk",
- "android.hardware.health-V1-ndk",
+ "android.hardware.health-V2-ndk",
"libhealthshim",
"librecovery_ui",
"libfusesideload",
diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java
index 6c5ea4b..00264b1 100644
--- a/tools/image_generator/ImageGenerator.java
+++ b/tools/image_generator/ImageGenerator.java
@@ -16,6 +16,8 @@
package com.android.recovery.tools;
+import static java.util.Map.entry;
+
import com.ibm.icu.text.BreakIterator;
import org.apache.commons.cli.CommandLine;
@@ -111,49 +113,43 @@
// https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
private static final String DEFAULT_FONT_NAME = "Roboto-Regular";
private static final Map<String, String> LANGUAGE_TO_FONT_MAP =
- new TreeMap<String, String>() {
- {
- put("am", "NotoSansEthiopic-VF");
- put("ar", "NotoNaskhArabicUI-Regular");
- put("as", "NotoSansBengaliUI-VF");
- put("bn", "NotoSansBengaliUI-VF");
- put("fa", "NotoNaskhArabicUI-Regular");
- put("gu", "NotoSansGujaratiUI-Regular");
- put("hi", "NotoSansDevanagariUI-VF");
- put("hy", "NotoSansArmenian-VF");
- put("iw", "NotoSansHebrew-Regular");
- put("ja", "NotoSansCJK-Regular");
- put("ka", "NotoSansGeorgian-VF");
- put("ko", "NotoSansCJK-Regular");
- put("km", "NotoSansKhmerUI-Regular");
- put("kn", "NotoSansKannadaUI-VF");
- put("lo", "NotoSansLaoUI-Regular");
- put("ml", "NotoSansMalayalamUI-VF");
- put("mr", "NotoSansDevanagariUI-VF");
- put("my", "NotoSansMyanmarUI-Regular");
- put("ne", "NotoSansDevanagariUI-VF");
- put("or", "NotoSansOriya-Regular");
- put("pa", "NotoSansGurmukhiUI-VF");
- put("si", "NotoSansSinhalaUI-VF");
- put("ta", "NotoSansTamilUI-VF");
- put("te", "NotoSansTeluguUI-VF");
- put("th", "NotoSansThaiUI-Regular");
- put("ur", "NotoNaskhArabicUI-Regular");
- put("zh", "NotoSansCJK-Regular");
- }
- };
+ Map.ofEntries(
+ entry("am", "NotoSansEthiopic-VF"),
+ entry("ar", "NotoNaskhArabicUI-Regular"),
+ entry("as", "NotoSansBengaliUI-VF"),
+ entry("bn", "NotoSansBengaliUI-VF"),
+ entry("fa", "NotoNaskhArabicUI-Regular"),
+ entry("gu", "NotoSansGujaratiUI-Regular"),
+ entry("hi", "NotoSansDevanagariUI-VF"),
+ entry("hy", "NotoSansArmenian-VF"),
+ entry("iw", "NotoSansHebrew-Regular"),
+ entry("ja", "NotoSansCJK-Regular"),
+ entry("ka", "NotoSansGeorgian-VF"),
+ entry("ko", "NotoSansCJK-Regular"),
+ entry("km", "NotoSansKhmerUI-Regular"),
+ entry("kn", "NotoSansKannadaUI-VF"),
+ entry("lo", "NotoSansLaoUI-Regular"),
+ entry("ml", "NotoSansMalayalamUI-VF"),
+ entry("mr", "NotoSansDevanagariUI-VF"),
+ entry("my", "NotoSansMyanmarUI-Regular"),
+ entry("ne", "NotoSansDevanagariUI-VF"),
+ entry("or", "NotoSansOriya-Regular"),
+ entry("pa", "NotoSansGurmukhiUI-VF"),
+ entry("si", "NotoSansSinhalaUI-VF"),
+ entry("ta", "NotoSansTamilUI-VF"),
+ entry("te", "NotoSansTeluguUI-VF"),
+ entry("th", "NotoSansThaiUI-Regular"),
+ entry("ur", "NotoNaskhArabicUI-Regular"),
+ entry("zh", "NotoSansCJK-Regular"));
// Languages that write from right to left.
private static final Set<String> RTL_LANGUAGE =
- new HashSet<String>() {
- {
- add("ar"); // Arabic
- add("fa"); // Persian
- add("he"); // Hebrew
- add("iw"); // Hebrew
- add("ur"); // Urdu
- }
- };
+ Set.of(
+ "ar", // Arabic
+ "fa", // Persian
+ "he", // Hebrew
+ "iw", // Hebrew
+ "ur"); // Urdu
/** Exception to indicate the failure to find the translated text strings. */
public static class LocalizedStringNotFoundException extends Exception {
diff --git a/tools/recovery_l10n/res/values-en-rCA/strings.xml b/tools/recovery_l10n/res/values-en-rCA/strings.xml
index 6451e5b..69be4bb 100644
--- a/tools/recovery_l10n/res/values-en-rCA/strings.xml
+++ b/tools/recovery_l10n/res/values-en-rCA/strings.xml
@@ -9,6 +9,6 @@
<string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"Cannot load Android system. Your data may be corrupt. If you continue to get this message, you may need to perform a factory data reset and erase all user data stored on this device."</string>
<string name="recovery_try_again" msgid="7168248750158873496">"Try again"</string>
<string name="recovery_factory_data_reset" msgid="7321351565602894783">"Factory data reset"</string>
- <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Wipe all user data?\n\n THIS CANNOT BE UNDONE!"</string>
+ <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Wipe all user data?\n\n THIS CAN NOT BE UNDONE!"</string>
<string name="recovery_cancel_wipe_data" msgid="66987687653647384">"Cancel"</string>
</resources>
diff --git a/tools/recovery_l10n/res/values-eu/strings.xml b/tools/recovery_l10n/res/values-eu/strings.xml
index 005a042..963101f 100644
--- a/tools/recovery_l10n/res/values-eu/strings.xml
+++ b/tools/recovery_l10n/res/values-eu/strings.xml
@@ -9,6 +9,6 @@
<string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"Ezin da kargatu Android sistema. Zure datuak hondatuta egon daitezke. Mezu hau jasotzen jarraitzen baduzu, jatorrizko datuak berrezarri beharko dituzu eta gailuan gordetako erabiltzaile-datu guztiak ezabatu beharko dituzu."</string>
<string name="recovery_try_again" msgid="7168248750158873496">"Saiatu berriro"</string>
<string name="recovery_factory_data_reset" msgid="7321351565602894783">"Berrezarri jatorrizko datuak"</string>
- <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Erabiltzailearen datu guztiak xahutu nahi dituzu?\n\n EKINTZA HORI EZIN DA DESEGIN!"</string>
+ <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Erabiltzaile-datu guztiak xahutu nahi dituzu?\n\n EKINTZA HORI EZIN DA DESEGIN!"</string>
<string name="recovery_cancel_wipe_data" msgid="66987687653647384">"Utzi"</string>
</resources>
diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp
index ea47a65..a0160e2 100644
--- a/update_verifier/update_verifier.cpp
+++ b/update_verifier/update_verifier.cpp
@@ -150,7 +150,6 @@
static constexpr size_t kBlockSize = 4096;
std::vector<uint8_t> buf(1024 * kBlockSize);
- size_t block_count = 0;
for (const auto& [range_start, range_end] : group) {
if (lseek64(fd.get(), static_cast<off64_t>(range_start) * kBlockSize, SEEK_SET) == -1) {
PLOG(ERROR) << "lseek to " << range_start << " failed";
@@ -166,9 +165,7 @@
}
remain -= to_read;
}
- block_count += (range_end - range_start);
}
- LOG(INFO) << "Finished reading " << block_count << " blocks on " << dm_block_device;
return true;
};
@@ -179,8 +176,8 @@
for (auto& t : threads) {
ret = t.get() && ret;
}
- LOG(INFO) << "Finished reading blocks on " << dm_block_device << " with " << thread_num
- << " threads.";
+ LOG(INFO) << "Finished reading blocks on partition " << partition_name << " @ " << dm_block_device
+ << " with " << thread_num << " threads.";
return ret;
}