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

Commit 05ced454 authored by Vladimir Marko's avatar Vladimir Marko Committed by Android (Google) Code Review
Browse files

Merge "Restrict updatable-media to android.media package."

parents f78d319a d634f2b4

media/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -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.

media/apex/java/android/media/MediaPlayer2.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

media/proto/jarjar-rules.txt

+1 −1
Original line number Diff line number Diff line 
rule com.google.protobuf.** com.android.media.protobuf.@1

rule com.google.protobuf.** android.media.protobuf.@1