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

Commit 566e3fba authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"...

Merge "Update language to comply with Android's inclusive language guidance" am: 7c61a353 am: a771406f am: c9e32cc1

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1375152

Change-Id: Id6a942947fe51ba9668caef25f55f2485055b24a
parents 7e83ed80 c9e32cc1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ size_t loadEffects(const Effects& effects, list_elem_t* libList, list_elem_t** s
            }
            listPush(effectLoadResult.effectDesc.get(), subEffectList);

            // Since we return a dummy descriptor for the proxy during
            // Since we return a stub descriptor for the proxy during
            // get_descriptor call, we replace it with the corresponding
            // sw effect descriptor, but keep the Proxy UUID
            *effectLoadResult.effectDesc = *swEffectLoadResult.effectDesc;