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

Commit 6bfd4b99 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" am: b1f872ad 

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

Change-Id: I62b15e1c5f23f0ba1c62ee6d4ab7940e4a650ddb
parents 6d43dbfb b1f872ad

drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ status_t ClearKeyFetcher::ObtainKey(const sp<ABuffer>& buffer, 
    }

    ALOGV("descriptor_size=%zu", container.descriptor_size());



    // Sanity check to verify that the BroadcastEncryptor is sending a properly

    // formed EcmContainer. If it contains two Ecms, the ids should have different

    // Validate that the BroadcastEncryptor is sending a properly formed

    // EcmContainer. If it contains two Ecms, the ids should have different

    // parity (one odd, one even). This does not necessarily affect decryption

    // but indicates a problem with Ecm generation.

    if (container.descriptor_size() == 2) {