| commit | f8c7dc56dc15ec9294c812995c5ceda0fa598c0e | [log] [tgz] |
|---|---|---|
| author | Sandro Montanari <sandrom@google.com> | Mon Dec 13 18:33:10 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 13 18:33:10 2021 +0000 |
| tree | 076b2fb7f530079e1eef061007651deaf982d5fb | |
| parent | 536088e0be7e41dd343f93d3b3f052e05f8824a7 [diff] | |
| parent | 896bdeb4dd96af0d62996084882492523bc886dd [diff] |
Merge "Update language to comply with Android's inclusive language guidance Test: m checkbuild" am: 9c9bafffe8 am: 8ca1bd9157 am: 896bdeb4dd Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1918177 Change-Id: I3d49d65c827d0b15a86a0508d3442e6f478e25b7
diff --git a/media/libstagefright/include/media/stagefright/MediaBuffer.h b/media/libstagefright/include/media/stagefright/MediaBuffer.h index 2c03f27..f070aac 100644 --- a/media/libstagefright/include/media/stagefright/MediaBuffer.h +++ b/media/libstagefright/include/media/stagefright/MediaBuffer.h
@@ -105,7 +105,6 @@ if (mMemory.get() == nullptr || mMemory->unsecurePointer() == nullptr) return 0; int32_t remoteRefcount = reinterpret_cast<SharedControl *>(mMemory->unsecurePointer())->getRemoteRefcount(); - // Sanity check so that remoteRefCount() is non-negative. return remoteRefcount >= 0 ? remoteRefcount : 0; // do not allow corrupted data. #else return 0;