Commit e05e139c authored Aug 07, 2020 by Santiago Seifert Committed by Automerger Merge Worker Aug 07, 2020

Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev am:...

Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev am: a52141c6 am: e7b045a9

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

Change-Id: Id11dba8b0a1f9892e71bb58afafb11d07d391eb6

framework-jarjar-rules.txt

+4 −0

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