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

Commit 6ebafa30 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Restrict OWNERS of playback components to Android Media Solutions team"... 

Merge "Restrict OWNERS of playback components to Android Media Solutions team" into main am: 87d79707 am: d36dfbe5

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



Change-Id: I215c354783984f76b55f54a94a10f26c9ad1422f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 93f5eeef d36dfbe5

media/java/android/media/OWNERS

+3 −0
Original line number Diff line number Diff line
@@ -10,5 +10,8 @@ include platform/frameworks/av:/media/janitors/media_solutions_OWNERS 


per-file *Image* = file:/graphics/java/android/graphics/OWNERS



per-file ExifInterface.java,ExifInterfaceUtils.java,IMediaHTTPConnection.aidl,IMediaHTTPService.aidl,JetPlayer.java,MediaDataSource.java,MediaExtractor.java,MediaHTTPConnection.java,MediaHTTPService.java,MediaPlayer.java=set noparent

per-file ExifInterface.java,ExifInterfaceUtils.java,IMediaHTTPConnection.aidl,IMediaHTTPService.aidl,JetPlayer.java,MediaDataSource.java,MediaExtractor.java,MediaHTTPConnection.java,MediaHTTPService.java,MediaPlayer.java=file:platform/frameworks/av:/media/janitors/media_solutions_OWNERS



# Haptics team also works on Ringtone

per-file *Ringtone* = file:/services/core/java/com/android/server/vibrator/OWNERS

media/jni/OWNERS

+3 −0
Original line number Diff line number Diff line
@@ -3,3 +3,6 @@ per-file android_mtp_*.cpp=aprasath@google.com,anothermark@google.com,kumarashis 


# extra for TV related files

per-file android_media_tv_*=hgchen@google.com,quxiangfang@google.com



per-file android_media_JetPlayer.cpp,android_media_MediaDataSource.cpp,android_media_MediaDataSource.h,android_media_MediaPlayer.java=set noparent

per-file android_media_JetPlayer.cpp,android_media_MediaDataSource.cpp,android_media_MediaDataSource.h,android_media_MediaPlayer.java=file:platform/frameworks/av:/media/janitors/media_solutions_OWNERS