Commit 2b5daaae authored Sep 08, 2020 by Anton Hansson Committed by Automerger Merge Worker Sep 08, 2020

Merge "Revert "Add updatable-media jarjar rules to framework-all"" into...

Merge "Revert "Add updatable-media jarjar rules to framework-all"" into rvc-dev-plus-aosp am: c7ecd67a am: f68b135e am: a6e8bee8

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

Change-Id: Ic4ace22df53ec560b9683d8ad32b183109041790

framework-jarjar-rules.txt

+0 −4

Original line number	Diff line number	Diff line
		rule android.hidl.** android.internal.hidl.@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