Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3e2f0b0 authored by Tim Kryger's avatar Tim Kryger Committed by android-build-merger
Browse files

resolve merge conflicts of 48be23c8 to nyc-mr1-dev-plus-aosp

am: a5876e43

Change-Id: I16d8e6bdfa1401b534a2ac53b2fb3c2a41d0ef58
parents 5c13ade6 a5876e43
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -209,10 +209,12 @@ bool WearRecoveryUI::Init() {
        return false;
    }

    LoadBitmap("icon_installing", &backgroundIcon[INSTALLING_UPDATE]);
    backgroundIcon[ERASING] = backgroundIcon[INSTALLING_UPDATE];
    LoadBitmap("icon_error", &backgroundIcon[ERROR]);
    backgroundIcon[NO_COMMAND] = backgroundIcon[ERROR];

    // This leaves backgroundIcon[INSTALLING_UPDATE] and backgroundIcon[ERASING]
    // as NULL which is fine since draw_background_locked() doesn't use them.

    return true;
}