Merge "FlaggedApi: enable enforcement for all non-updatable APIs" into aosp-main-future (f1c2cd8e) · Commits · e / os / android_frameworks_base

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -568,6 +568,7 @@ metalava_framework_docs_args = "" +
		"--api-lint-ignore-prefix org. " +
		"--error NoSettingsProvider " +
		"--error UnhiddenSystemApi " +
		"--error UnflaggedApi " +
		"--force-convert-to-warning-nullability-annotations +:-android.:+android.icu.:-dalvik. " +
		"--hide BroadcastBehavior " +
		"--hide CallbackInterface " +

api/StubLibraries.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ droidstubs {
		api_lint: {
		enabled: true,
		new_since: ":android.api.public.latest",
		baseline_file: ":non-updatable-lint-baseline.txt",
		},
		},
		dists: [
		@@ -143,6 +144,7 @@ droidstubs {
		},
		api_lint: {
		enabled: true,
		new_since: ":android.api.test.latest",
		baseline_file: ":non-updatable-test-lint-baseline.txt",
		},
		},

core/api/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,11 @@ filegroup {
		srcs: ["removed.txt"],
		}

		filegroup {
		name: "non-updatable-lint-baseline.txt",
		srcs: ["lint-baseline.txt"],
		}

		filegroup {
		name: "non-updatable-system-current.txt",
		srcs: ["system-current.txt"],

core/api/lint-baseline.txt

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		// Baseline format: 1.0
		UnflaggedApi: android.content.pm.PackageManager#FEATURE_THREAD_NETWORK:
		New API must be flagged with @FlaggedApi: field android.content.pm.PackageManager.FEATURE_THREAD_NETWORK
		UnflaggedApi: android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM:
		New API must be flagged with @FlaggedApi: field android.os.Build.VERSION_CODES.VANILLA_ICE_CREAM
		UnflaggedApi: android.os.UserManager#DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO:
		New API must be flagged with @FlaggedApi: field android.os.UserManager.DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO

core/api/module-lib-lint-baseline.txt

+38 −0

Original line number	Diff line number	Diff line
		@@ -57,3 +57,41 @@ SamShouldBeLast: android.os.IBinder#linkToDeath(android.os.IBinder.DeathRecipien
		SAM-compatible parameters (such as parameter 1, "recipient", in android.os.IBinder.linkToDeath) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions
		SamShouldBeLast: android.os.IBinder#unlinkToDeath(android.os.IBinder.DeathRecipient, int):
		SAM-compatible parameters (such as parameter 1, "recipient", in android.os.IBinder.unlinkToDeath) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions


		UnflaggedApi: android.Manifest.permission#MANAGE_REMOTE_AUTH:
		New API must be flagged with @FlaggedApi: field android.Manifest.permission.MANAGE_REMOTE_AUTH
		UnflaggedApi: android.Manifest.permission#USE_COMPANION_TRANSPORTS:
		New API must be flagged with @FlaggedApi: field android.Manifest.permission.USE_COMPANION_TRANSPORTS
		UnflaggedApi: android.Manifest.permission#USE_REMOTE_AUTH:
		New API must be flagged with @FlaggedApi: field android.Manifest.permission.USE_REMOTE_AUTH
		UnflaggedApi: android.app.Activity#isResumed():
		New API must be flagged with @FlaggedApi: method android.app.Activity.isResumed()
		UnflaggedApi: android.companion.CompanionDeviceManager#MESSAGE_REQUEST_CONTEXT_SYNC:
		New API must be flagged with @FlaggedApi: field android.companion.CompanionDeviceManager.MESSAGE_REQUEST_CONTEXT_SYNC
		UnflaggedApi: android.companion.CompanionDeviceManager#MESSAGE_REQUEST_PERMISSION_RESTORE:
		New API must be flagged with @FlaggedApi: field android.companion.CompanionDeviceManager.MESSAGE_REQUEST_PERMISSION_RESTORE
		UnflaggedApi: android.companion.CompanionDeviceManager#MESSAGE_REQUEST_REMOTE_AUTHENTICATION:
		New API must be flagged with @FlaggedApi: field android.companion.CompanionDeviceManager.MESSAGE_REQUEST_REMOTE_AUTHENTICATION
		UnflaggedApi: android.companion.CompanionDeviceManager#addOnMessageReceivedListener(java.util.concurrent.Executor, int, android.companion.CompanionDeviceManager.OnMessageReceivedListener):
		New API must be flagged with @FlaggedApi: method android.companion.CompanionDeviceManager.addOnMessageReceivedListener(java.util.concurrent.Executor,int,android.companion.CompanionDeviceManager.OnMessageReceivedListener)
		UnflaggedApi: android.companion.CompanionDeviceManager#addOnTransportsChangedListener(java.util.concurrent.Executor, android.companion.CompanionDeviceManager.OnTransportsChangedListener):
		New API must be flagged with @FlaggedApi: method android.companion.CompanionDeviceManager.addOnTransportsChangedListener(java.util.concurrent.Executor,android.companion.CompanionDeviceManager.OnTransportsChangedListener)
		UnflaggedApi: android.companion.CompanionDeviceManager#removeOnMessageReceivedListener(int, android.companion.CompanionDeviceManager.OnMessageReceivedListener):
		New API must be flagged with @FlaggedApi: method android.companion.CompanionDeviceManager.removeOnMessageReceivedListener(int,android.companion.CompanionDeviceManager.OnMessageReceivedListener)
		UnflaggedApi: android.companion.CompanionDeviceManager#removeOnTransportsChangedListener(android.companion.CompanionDeviceManager.OnTransportsChangedListener):
		New API must be flagged with @FlaggedApi: method android.companion.CompanionDeviceManager.removeOnTransportsChangedListener(android.companion.CompanionDeviceManager.OnTransportsChangedListener)
		UnflaggedApi: android.companion.CompanionDeviceManager#sendMessage(int, byte[], int[]):
		New API must be flagged with @FlaggedApi: method android.companion.CompanionDeviceManager.sendMessage(int,byte[],int[])
		UnflaggedApi: android.companion.CompanionDeviceManager.OnMessageReceivedListener:
		New API must be flagged with @FlaggedApi: class android.companion.CompanionDeviceManager.OnMessageReceivedListener
		UnflaggedApi: android.companion.CompanionDeviceManager.OnMessageReceivedListener#onMessageReceived(int, byte[]):
		New API must be flagged with @FlaggedApi: method android.companion.CompanionDeviceManager.OnMessageReceivedListener.onMessageReceived(int,byte[])
		UnflaggedApi: android.companion.CompanionDeviceManager.OnTransportsChangedListener:
		New API must be flagged with @FlaggedApi: class android.companion.CompanionDeviceManager.OnTransportsChangedListener
		UnflaggedApi: android.companion.CompanionDeviceManager.OnTransportsChangedListener#onTransportsChanged(java.util.List<android.companion.AssociationInfo>):
		New API must be flagged with @FlaggedApi: method android.companion.CompanionDeviceManager.OnTransportsChangedListener.onTransportsChanged(java.util.List<android.companion.AssociationInfo>)
		UnflaggedApi: android.content.Context#REMOTE_AUTH_SERVICE:
		New API must be flagged with @FlaggedApi: field android.content.Context.REMOTE_AUTH_SERVICE
		UnflaggedApi: android.os.IpcDataCache#MODULE_TELEPHONY:
		New API must be flagged with @FlaggedApi: field android.os.IpcDataCache.MODULE_TELEPHONY