diff options
| author | 2019-04-02 15:31:47 +0100 | |
|---|---|---|
| committer | 2019-04-09 16:35:37 +0100 | |
| commit | c631e8f2043df8416404632be35710ebcc835a58 (patch) | |
| tree | 9a3947a1cd9372cf7a942bb7512456a84c2ba10c | |
| parent | 09c94276369a9bf004f266627fb91c05443984ad (diff) | |
Restrict updatable-media to android.media package.
Test: m
Bug: 122937705
(cherry picked from commit d634f2b44e5d029d685068ecd86df7c734f1e296)
Change-Id: Ie246387748fd7410b8cc8270bd123c71df07ef2a
Merged-In: I7cad8971d1dcf301cc7d0a8c15ebde9e14d1e18a
| -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 |