Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Restrict updatable-media to android.media package." into qt-dev

Browse Source
This commit is contained in:
Vladimir Marko
2019-04-10 09:46:32 +00:00
committed by Android (Google) Code Review
parent e777220a38 c631e8f204
commit 38c298ac32
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/Android.bp
View File

@@ -24,6 +24,10 @@ java_library {
"mediaplayer2-protos",
],
permitted_packages: [
"android.media",
],
installable: true,
// Make sure that the implementaion only relies on SDK or system APIs.

2
media/apex/java/android/media/MediaPlayer2.java
View File

@@ -31,6 +31,7 @@ import android.media.MediaDrm.KeyRequest;
import android.media.MediaPlayer2.DrmInfo;
import android.media.MediaPlayer2Proto.PlayerMessage;
import android.media.MediaPlayer2Proto.Value;
import android.media.protobuf.InvalidProtocolBufferException;
import android.net.Uri;
import android.os.Handler;
import android.os.HandlerThread;
@@ -46,7 +47,6 @@ import android.view.Surface;
import android.view.SurfaceHolder;
import com.android.internal.annotations.GuardedBy;
import com.android.media.protobuf.InvalidProtocolBufferException;
import java.io.ByteArrayOutputStream;
import java.io.File;

2
media/proto/jarjar-rules.txt
View File

@@ -1,2 +1,2 @@
rule com.google.protobuf.** com.android.media.protobuf.@1
rule com.google.protobuf.** android.media.protobuf.@1