From 997277d694739a8c8832dc4d040626d988263913 Mon Sep 17 00:00:00 2001 From: Tim Zimmermann Date: Sat, 3 Sep 2022 12:06:48 +0200 Subject: minui: Support main fbdev connector in multi connector Blank function Test: Power off device, observe display no longer stays on in offline charging mode after animation finished Change-Id: I49b0fda43f0866583be04afb32214b2c2da2ed92 --- minui/graphics_fbdev.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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() { -- cgit v1.2.3 From 03a12e2ac9d5eeeba6b5dae3711345b2c4dab1dc Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Mon, 12 Sep 2022 12:27:06 -0700 Subject: Remove py2 usages Bug: 203436762 Test: m nothing Change-Id: I22087b1bbcb4fff64cc41210c9d74537197bb367 --- update_verifier/Android.bp | 13 ------------- 1 file changed, 13 deletions(-) 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, }, }, -- cgit v1.2.3