Merge "Conditionally report SimpleManualPermissionEnforcement lint as ERROR" (4ab7e829) · Commits · e / os / android_frameworks_base

tools/lint/global/checks/src/main/java/com/google/android/lint/aidl/SimpleManualPermissionEnforcementDetector.kt

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -53,10 +53,9 @@ class SimpleManualPermissionEnforcementDetector : AidlImplementationDetector() {
	lintFix		lintFix
	)		)

	// TODO(b/265014041): turn on errors once all code that would cause one is fixed		if (enforcePermissionFix.errorLevel) {
	// if (enforcePermissionFix.errorLevel) {		incident.overrideSeverity(Severity.ERROR)
	// incident.overrideSeverity(Severity.ERROR)		}
	// }

	context.report(incident)		context.report(incident)
	}		}

tools/lint/global/checks/src/test/java/com/google/android/lint/aidl/SimpleManualPermissionEnforcementDetectorTest.kt

+16 −16

Original line number	Original line	Diff line number	Diff line
	@@ -51,10 +51,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() {
	.run()		.run()
	.expect(		.expect(
	"""		"""
	src/Foo.java:7: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]		src/Foo.java:7: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]
	mContext.enforceCallingOrSelfPermission("android.permission.READ_CONTACTS", "foo");		mContext.enforceCallingOrSelfPermission("android.permission.READ_CONTACTS", "foo");
	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	0 errors, 1 warnings		1 errors, 0 warnings
	"""		"""
	)		)
	.expectFixDiffs(		.expectFixDiffs(
	@@ -168,10 +168,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() {
	.run()		.run()
	.expect(		.expect(
	"""		"""
	src/Foo.java:8: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]		src/Foo.java:8: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]
	mContext.enforceCallingOrSelfPermission(		mContext.enforceCallingOrSelfPermission(
	^		^
	0 errors, 1 warnings		1 errors, 0 warnings
	"""		"""
	)		)
	.expectFixDiffs(		.expectFixDiffs(
	@@ -209,10 +209,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() {
	.run()		.run()
	.expect(		.expect(
	"""		"""
	src/Foo.java:8: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]		src/Foo.java:8: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]
	mContext.enforceCallingOrSelfPermission(android.Manifest.permission.READ_CONTACTS, "foo");		mContext.enforceCallingOrSelfPermission(android.Manifest.permission.READ_CONTACTS, "foo");
	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	0 errors, 1 warnings		1 errors, 0 warnings
	"""		"""
	)		)
	.expectFixDiffs(		.expectFixDiffs(
	@@ -252,10 +252,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() {
	.run()		.run()
	.expect(		.expect(
	"""		"""
	src/Foo.java:10: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]		src/Foo.java:10: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]
	mContext.enforceCallingOrSelfPermission(		mContext.enforceCallingOrSelfPermission(
	^		^
	0 errors, 1 warnings		1 errors, 0 warnings
	"""		"""
	)		)
	.expectFixDiffs(		.expectFixDiffs(
	@@ -414,10 +414,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() {
	.run()		.run()
	.expect(		.expect(
	"""		"""
	src/Foo.java:14: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]		src/Foo.java:14: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]
	helper();		helper();
	~~~~~~~~~		~~~~~~~~~
	0 errors, 1 warnings		1 errors, 0 warnings
	"""		"""
	)		)
	.expectFixDiffs(		.expectFixDiffs(
	@@ -506,10 +506,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() {
	.run()		.run()
	.expect(		.expect(
	"""		"""
	src/Foo.java:16: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]		src/Foo.java:16: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]
	mContext.enforceCallingOrSelfPermission("FOO", "foo");		mContext.enforceCallingOrSelfPermission("FOO", "foo");
	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	0 errors, 1 warnings		1 errors, 0 warnings
	"""		"""
	)		)
	.expectFixDiffs(		.expectFixDiffs(
	@@ -558,10 +558,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() {
	.run()		.run()
	.expect(		.expect(
	"""		"""
	src/Foo.java:19: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]		src/Foo.java:19: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]
	helperHelper();		helperHelper();
	~~~~~~~~~~~~~~~		~~~~~~~~~~~~~~~
	0 errors, 1 warnings		1 errors, 0 warnings
	"""		"""
	)		)
	.expectFixDiffs(		.expectFixDiffs(
	@@ -599,10 +599,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() {
	.run()		.run()
	.expect(		.expect(
	"""		"""
	src/Foo.java:7: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]		src/Foo.java:7: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]
	if (mContext.checkCallingOrSelfPermission("android.permission.READ_CONTACTS", "foo")		if (mContext.checkCallingOrSelfPermission("android.permission.READ_CONTACTS", "foo")
	^		^
	0 errors, 1 warnings		1 errors, 0 warnings
	"""		"""
	)		)
	.expectFixDiffs(		.expectFixDiffs(