Skip to content

Commit

Permalink
Merge tag 'android-13.0.0_r74' into thirteen
Browse files Browse the repository at this point in the history
Android 13.0.0 Release 74 (TQ3C.230805.001.B2)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZNGvDgAKCRDorT+BmrEO
# eMxgAJ9XfOJXQB8AUCK4VMHPwUO5Cr3WbgCfXrISSdZdlRd5X0PvSYkHBV562x0=
# =ZdvE
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 08 Aug 2023 04:57:18 AM CEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Can't check signature: No public key

* tag 'android-13.0.0_r74' of https://android.googlesource.com/platform/frameworks/native:
  DO NOT MERGE Reverts WindowInfosListenerInvoker throttling
  Add pending command buffer reset
  Add pending command buffer reset
  • Loading branch information
whyredfire committed Aug 8, 2023
2 parents d7cb93f + ee3935f commit 7cd82d9
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
Expand Up @@ -765,6 +765,7 @@ Error AidlComposer::execute() {
auto status = mAidlComposerClient->executeCommands(commands, &results);
if (!status.isOk()) {
ALOGE("executeCommands failed %s", status.getDescription().c_str());
mWriter.reset();
return static_cast<Error>(status.getServiceSpecificError());
}

Expand All @@ -776,6 +777,7 @@ Error AidlComposer::execute() {
const auto index = static_cast<size_t>(cmdErr.commandIndex);
if (index < 0 || index >= commands.size()) {
ALOGE("invalid command index %zu", index);
mWriter.reset();
return Error::BAD_PARAMETER;
}

Expand Down

0 comments on commit 7cd82d9

Please sign in to comment.