diff options
| -rw-r--r-- | media/Android.bp | 4 | ||||
| -rw-r--r-- | media/apex/java/android/media/MediaPlayer2.java | 2 | ||||
| -rw-r--r-- | media/proto/jarjar-rules.txt | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/media/Android.bp b/media/Android.bp index 34801813ee87..8746046c220d 100644 --- a/media/Android.bp +++ b/media/Android.bp @@ -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. diff --git a/media/apex/java/android/media/MediaPlayer2.java b/media/apex/java/android/media/MediaPlayer2.java index 87035da3d513..db33e8239175 100644 --- a/media/apex/java/android/media/MediaPlayer2.java +++ b/media/apex/java/android/media/MediaPlayer2.java @@ -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; diff --git a/media/proto/jarjar-rules.txt b/media/proto/jarjar-rules.txt index bfb0b2782486..e73f86dddac1 100644 --- a/media/proto/jarjar-rules.txt +++ b/media/proto/jarjar-rules.txt @@ -1,2 +1,2 @@ -rule com.google.protobuf.** com.android.media.protobuf.@1 +rule com.google.protobuf.** android.media.protobuf.@1 |