Merge "Revert "Add updatable-media jarjar rules to framework-all"" into rvc-dev-plus-aosp am: c7ecd67a69 am: f68b135eed

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

Change-Id: Iade1866d2af347ac0cdb248e4e022661001f2028
This commit is contained in:
Anton Hansson
2020-09-08 15:26:24 +00:00
committed by Automerger Merge Worker

View File

@@ -1,6 +1,2 @@
rule android.hidl.** android.internal.hidl.@1 rule android.hidl.** android.internal.hidl.@1
rule android.net.wifi.WifiAnnotations* android.internal.wifi.WifiAnnotations@1 rule android.net.wifi.WifiAnnotations* android.internal.wifi.WifiAnnotations@1
# Hide media mainline module implementation classes to avoid collisions with
# app-bundled ExoPlayer classes.
rule com.google.android.exoplayer2.** android.media.internal.exo.@1