Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

866545a9

Commit 866545a9 authored 1 year ago by Arun Johnson Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge changes from topic "largeAudioFrame" into main am: 3a4be69c am: d521b4dd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2952967

Change-Id: I122c3569152a1334370562cbffd6f0046471df98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents f26a5694 d521b4dd

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

core/api/current.txt 2 additions, 0 deletions

core/api/current.txt
media/java/android/media/MediaCodec.java 95 additions, 6 deletions

media/java/android/media/MediaCodec.java
media/jni/android_media_MediaCodec.cpp 193 additions, 18 deletions

media/jni/android_media_MediaCodec.cpp
media/jni/android_media_MediaCodec.h 10 additions, 6 deletions

media/jni/android_media_MediaCodec.h

with 300 additions and 30 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment