summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-09-14 03:00:38 +0200
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-09-14 03:00:38 +0200
commit9f4a410d5605ab7e2515611605a403096fa036ba (patch)
treeb872510d0efa8945b891c196207646952b1de681
parentSnap for 9049091 from 8e11c55b36452a8c5afebb720f517060b9f802c4 to udc-d1-release (diff)
parentMerge "minui: Support main fbdev connector in multi connector Blank function" am: 3f125fa897 am: 71a1763a22 am: 581fd1501b am: b9754fd79f am: 872002acd6 (diff)
downloadandroid_bootable_recovery-9f4a410d5605ab7e2515611605a403096fa036ba.tar
android_bootable_recovery-9f4a410d5605ab7e2515611605a403096fa036ba.tar.gz
android_bootable_recovery-9f4a410d5605ab7e2515611605a403096fa036ba.tar.bz2
android_bootable_recovery-9f4a410d5605ab7e2515611605a403096fa036ba.tar.lz
android_bootable_recovery-9f4a410d5605ab7e2515611605a403096fa036ba.tar.xz
android_bootable_recovery-9f4a410d5605ab7e2515611605a403096fa036ba.tar.zst
android_bootable_recovery-9f4a410d5605ab7e2515611605a403096fa036ba.zip
-rw-r--r--minui/graphics_fbdev.cpp6
-rw-r--r--update_verifier/Android.bp13
2 files changed, 5 insertions, 14 deletions
diff --git a/minui/graphics_fbdev.cpp b/minui/graphics_fbdev.cpp
index 4a7d3252b..2711af74c 100644
--- a/minui/graphics_fbdev.cpp
+++ b/minui/graphics_fbdev.cpp
@@ -44,7 +44,11 @@ void MinuiBackendFbdev::Blank(bool blank) {
}
void MinuiBackendFbdev::Blank(bool blank, DrmConnector index) {
- fprintf(stderr, "Unsupported multiple connectors, blank = %d, index = %d\n", blank, index);
+ if (index == DRM_MAIN) {
+ MinuiBackendFbdev::Blank(blank);
+ } else {
+ fprintf(stderr, "Unsupported multiple connectors, blank = %d, index = %d\n", blank, index);
+ }
}
bool MinuiBackendFbdev::HasMultipleConnectors() {
diff --git a/update_verifier/Android.bp b/update_verifier/Android.bp
index 3c4ec4a99..26ff5305c 100644
--- a/update_verifier/Android.bp
+++ b/update_verifier/Android.bp
@@ -39,14 +39,6 @@ python_library_host {
"care_map.proto",
],
proto: {type: "lite", canonical_path_from_root: false},
- version: {
- py2: {
- enabled: true,
- },
- py3: {
- enabled: true,
- },
- },
visibility: [
"//build/make/tools/releasetools:__subpackages__",
],
@@ -145,12 +137,7 @@ python_binary_host {
},
version: {
- py2: {
- enabled: false,
- embedded_launcher: false,
- },
py3: {
- enabled: true,
embedded_launcher: true,
},
},