Merge "[Ravenwood] Dedup annotation allowed class list" into main (b48bcd52) · Commits · e / os / android_frameworks_base

ravenwood/scripts/sort-annotation-allowlist.py

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ output_name = f"{file_name}.tmp"
	with open(file_name) as f:		with open(file_name) as f:
	lines = f.readlines()		lines = f.readlines()

	wildcards = []		wildcards = set()
	pkg_dict = {}		pkg_dict = {}

	for line in lines:		for line in lines:
	@@ -42,16 +42,16 @@ for line in lines:
	if not class_name:		if not class_name:
	continue		continue
	if "*" in class_name:		if "*" in class_name:
	wildcards.append(line)		wildcards.add(line)
	continue		continue
	pkg = class_name.rsplit(".", 1)[0]		pkg = class_name.rsplit(".", 1)[0]
	if pkg not in pkg_dict:		if pkg not in pkg_dict:
	pkg_dict[pkg] = []		pkg_dict[pkg] = set()
	pkg_dict[pkg].append(line)		pkg_dict[pkg].add(line)


	with open(output_name, "w") as f:		with open(output_name, "w") as f:
	print("# Only classes listed here can use the Ravenwood annotations.", file=f)		print("# Only classes listed here can use the Ravenwood annotations. Keep the list alphabetically sorted.", file=f)
	print("", file=f)		print("", file=f)

	# Put wildcards first		# Put wildcards first

ravenwood/texts/ravenwood-annotation-allowed-classes.txt

+0 −15

Original line number	Original line	Diff line number	Diff line
	@@ -100,7 +100,6 @@ android.graphics.BLASTBufferQueue
	android.graphics.BaseCanvas		android.graphics.BaseCanvas
	android.graphics.BaseRecordingCanvas		android.graphics.BaseRecordingCanvas
	android.graphics.Bitmap		android.graphics.Bitmap
	android.graphics.Bitmap$Config
	android.graphics.BitmapFactory		android.graphics.BitmapFactory
	android.graphics.BitmapRegionDecoder		android.graphics.BitmapRegionDecoder
	android.graphics.BitmapShader		android.graphics.BitmapShader
	@@ -236,7 +235,6 @@ android.os.DeadSystemException
	android.os.FileUtils		android.os.FileUtils
	android.os.Handler		android.os.Handler
	android.os.HandlerExecutor		android.os.HandlerExecutor
	android.os.HandlerExecutor
	android.os.HandlerThread		android.os.HandlerThread
	android.os.IBinder		android.os.IBinder
	android.os.IpcDataCache		android.os.IpcDataCache
	@@ -252,9 +250,7 @@ android.os.ParcelUuid
	android.os.Parcelable		android.os.Parcelable
	android.os.PatternMatcher		android.os.PatternMatcher
	android.os.PerfettoTrace		android.os.PerfettoTrace
	android.os.PerfettoTrace$Category
	android.os.PerfettoTrackEventExtra		android.os.PerfettoTrackEventExtra
	android.os.PerfettoTrackEventExtra$NoOpBuilder
	android.os.PermissionEnforcer		android.os.PermissionEnforcer
	android.os.PersistableBundle		android.os.PersistableBundle
	android.os.PowerComponents		android.os.PowerComponents
	@@ -441,7 +437,6 @@ android.util.AtomicFileBufferedPrintWriter
	android.util.AtomicFileOutputStream		android.util.AtomicFileOutputStream
	android.util.AtomicFilePrintWriter		android.util.AtomicFilePrintWriter
	android.util.BackupUtils		android.util.BackupUtils
	android.util.BackupUtils
	android.util.Base64		android.util.Base64
	android.util.Base64DataException		android.util.Base64DataException
	android.util.Base64InputStream		android.util.Base64InputStream
	@@ -460,7 +455,6 @@ android.util.FloatMath
	android.util.FloatProperty		android.util.FloatProperty
	android.util.Half		android.util.Half
	android.util.IndentingPrintWriter		android.util.IndentingPrintWriter
	android.util.IndentingPrintWriter
	android.util.IntArray		android.util.IntArray
	android.util.IntProperty		android.util.IntProperty
	android.util.JsonReader		android.util.JsonReader
	@@ -468,7 +462,6 @@ android.util.JsonWriter
	android.util.KeyValueListParser		android.util.KeyValueListParser
	android.util.ListenerGroup		android.util.ListenerGroup
	android.util.LocalLog		android.util.LocalLog
	android.util.LocalLog
	android.util.Log		android.util.Log
	android.util.LogPrinter		android.util.LogPrinter
	android.util.LogWriter		android.util.LogWriter
	@@ -491,7 +484,6 @@ android.util.MutableLong
	android.util.MutableShort		android.util.MutableShort
	android.util.NoSuchPropertyException		android.util.NoSuchPropertyException
	android.util.Pair		android.util.Pair
	android.util.Pair
	android.util.Patterns		android.util.Patterns
	android.util.Pools		android.util.Pools
	android.util.PrefixPrintWriter		android.util.PrefixPrintWriter
	@@ -502,7 +494,6 @@ android.util.Printer
	android.util.Property		android.util.Property
	android.util.Range		android.util.Range
	android.util.Rational		android.util.Rational
	android.util.Rational
	android.util.RecurrenceRule		android.util.RecurrenceRule
	android.util.ReflectiveProperty		android.util.ReflectiveProperty
	android.util.RotationUtils		android.util.RotationUtils
	@@ -565,7 +556,6 @@ com.android.internal.os.BinderLatencyBuckets
	com.android.internal.os.BinderfsStatsReader		com.android.internal.os.BinderfsStatsReader
	com.android.internal.os.CachedDeviceState		com.android.internal.os.CachedDeviceState
	com.android.internal.os.Clock		com.android.internal.os.Clock
	com.android.internal.os.Clock
	com.android.internal.os.CpuScalingPolicies		com.android.internal.os.CpuScalingPolicies
	com.android.internal.os.CpuScalingPolicyReader		com.android.internal.os.CpuScalingPolicyReader
	com.android.internal.os.KernelCpuThreadReader		com.android.internal.os.KernelCpuThreadReader
	@@ -574,7 +564,6 @@ com.android.internal.os.LongArrayMultiStateCounter
	com.android.internal.os.LongMultiStateCounter		com.android.internal.os.LongMultiStateCounter
	com.android.internal.os.LooperStats		com.android.internal.os.LooperStats
	com.android.internal.os.MonotonicClock		com.android.internal.os.MonotonicClock
	com.android.internal.os.MonotonicClock
	com.android.internal.os.PowerProfile		com.android.internal.os.PowerProfile
	com.android.internal.os.PowerStats		com.android.internal.os.PowerStats
	com.android.internal.os.ProcLocksReader		com.android.internal.os.ProcLocksReader
	@@ -606,17 +595,14 @@ com.android.internal.util.DumpableContainer
	com.android.internal.util.FastMath		com.android.internal.util.FastMath
	com.android.internal.util.FastPrintWriter		com.android.internal.util.FastPrintWriter
	com.android.internal.util.FileRotator		com.android.internal.util.FileRotator
	com.android.internal.util.FileRotator
	com.android.internal.util.GrowingArrayUtils		com.android.internal.util.GrowingArrayUtils
	com.android.internal.util.HeavyHitterSketch		com.android.internal.util.HeavyHitterSketch
	com.android.internal.util.HexDump		com.android.internal.util.HexDump
	com.android.internal.util.HexDump
	com.android.internal.util.IndentingPrintWriter		com.android.internal.util.IndentingPrintWriter
	com.android.internal.util.IntPair		com.android.internal.util.IntPair
	com.android.internal.util.LineBreakBufferedWriter		com.android.internal.util.LineBreakBufferedWriter
	com.android.internal.util.LocalLog		com.android.internal.util.LocalLog
	com.android.internal.util.MessageUtils		com.android.internal.util.MessageUtils
	com.android.internal.util.MessageUtils
	com.android.internal.util.ObjectUtils		com.android.internal.util.ObjectUtils
	com.android.internal.util.Parcelling		com.android.internal.util.Parcelling
	com.android.internal.util.ParseUtils		com.android.internal.util.ParseUtils
	@@ -627,7 +613,6 @@ com.android.internal.util.RingBuffer
	com.android.internal.util.SizedInputStream		com.android.internal.util.SizedInputStream
	com.android.internal.util.StringPool		com.android.internal.util.StringPool
	com.android.internal.util.TokenBucket		com.android.internal.util.TokenBucket
	com.android.internal.util.TokenBucket
	com.android.internal.util.XmlPullParserWrapper		com.android.internal.util.XmlPullParserWrapper
	com.android.internal.util.XmlSerializerWrapper		com.android.internal.util.XmlSerializerWrapper
	com.android.internal.util.XmlUtils		com.android.internal.util.XmlUtils