| commit | 8ca1bd915765caabe43ba578d26604713944e472 | [log] [tgz] |
|---|---|---|
| author | Sandro Montanari <sandrom@google.com> | Mon Dec 13 17:32:50 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 13 17:32:50 2021 +0000 |
| tree | 6d90d9d0bba8c375b7afa7bd4456dd71e006cfbf | |
| parent | 876c493abcbf133e9a6fd233a91a74832f81e89c [diff] | |
| parent | 9c9bafffe8645be71721f7b3b91a388cf7d2a539 [diff] |
Merge "Update language to comply with Android's inclusive language guidance Test: m checkbuild" am: 9c9bafffe8 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1918177 Change-Id: I335749953fc8b0200708ea59dcc328531d09017f
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;