From 3e5d384cd0673d350ac165e40bbb1e9986c6f261 Mon Sep 17 00:00:00 2001 From: Songchun Fan Date: Tue, 24 Aug 2021 19:07:24 +0000 Subject: Revert "Revert "[lint] treat non-user getter calls as lint errors with baselines to exempt existing failures"" This reverts commit 88dd20e6d4b1e5ebde4c106bd8075ea583bf4d1a. Reason for revert: Found the root cause, will fix it and try submit again BUG: 195968932 Test: manual Change-Id: I4a45ab4eb44756f4aec17fe938cfe53fc73c94cb --- services/backup/lint-baseline.xml | 15 ++ services/companion/lint-baseline.xml | 15 ++ services/core/lint-baseline.xml | 158 +++++++++++++++++++++ services/usb/lint-baseline.xml | 15 ++ .../CallingSettingsNonUserGetterMethodsDetector.kt | 5 +- ...ettingsNonUserGetterMethodsIssueDetectorTest.kt | 28 ++-- 6 files changed, 220 insertions(+), 16 deletions(-) create mode 100644 services/backup/lint-baseline.xml create mode 100644 services/companion/lint-baseline.xml create mode 100644 services/core/lint-baseline.xml create mode 100644 services/usb/lint-baseline.xml diff --git a/services/backup/lint-baseline.xml b/services/backup/lint-baseline.xml new file mode 100644 index 000000000000..28bb937cfd9c --- /dev/null +++ b/services/backup/lint-baseline.xml @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/services/companion/lint-baseline.xml b/services/companion/lint-baseline.xml new file mode 100644 index 000000000000..03eae3901e51 --- /dev/null +++ b/services/companion/lint-baseline.xml @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/services/core/lint-baseline.xml b/services/core/lint-baseline.xml new file mode 100644 index 000000000000..c5b054949bc5 --- /dev/null +++ b/services/core/lint-baseline.xml @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/usb/lint-baseline.xml b/services/usb/lint-baseline.xml new file mode 100644 index 000000000000..c2c0a350d5ad --- /dev/null +++ b/services/usb/lint-baseline.xml @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/tools/lint/checks/src/main/java/com/google/android/lint/CallingSettingsNonUserGetterMethodsDetector.kt b/tools/lint/checks/src/main/java/com/google/android/lint/CallingSettingsNonUserGetterMethodsDetector.kt index 641f337ab987..fe567da7c017 100644 --- a/tools/lint/checks/src/main/java/com/google/android/lint/CallingSettingsNonUserGetterMethodsDetector.kt +++ b/tools/lint/checks/src/main/java/com/google/android/lint/CallingSettingsNonUserGetterMethodsDetector.kt @@ -45,7 +45,8 @@ class CallingSettingsNonUserGetterMethodsDetector : Detector(), SourceCodeScanne evaluator.isMemberInClass(method, "android.provider.Settings.System") ) { val message = getIncidentMessageNonUserGetterMethods(getMethodSignature(method)) - context.report(ISSUE_NON_USER_GETTER_CALLED, node, context.getLocation(node), message) + context.report(ISSUE_NON_USER_GETTER_CALLED, node, context.getNameLocation(node), + message) } } @@ -68,7 +69,7 @@ class CallingSettingsNonUserGetterMethodsDetector : Detector(), SourceCodeScanne """, category = Category.CORRECTNESS, priority = 6, - severity = Severity.WARNING, + severity = Severity.ERROR, implementation = Implementation( CallingSettingsNonUserGetterMethodsDetector::class.java, Scope.JAVA_FILE_SCOPE diff --git a/tools/lint/checks/src/test/java/com/google/android/lint/CallingSettingsNonUserGetterMethodsIssueDetectorTest.kt b/tools/lint/checks/src/test/java/com/google/android/lint/CallingSettingsNonUserGetterMethodsIssueDetectorTest.kt index 1034029f6e9d..e72f38416310 100644 --- a/tools/lint/checks/src/test/java/com/google/android/lint/CallingSettingsNonUserGetterMethodsIssueDetectorTest.kt +++ b/tools/lint/checks/src/test/java/com/google/android/lint/CallingSettingsNonUserGetterMethodsIssueDetectorTest.kt @@ -71,13 +71,13 @@ class CallingSettingsNonUserGetterMethodsIssueDetectorTest : LintDetectorTest() .run() .expect( """ - src/test/pkg/TestClass1.java:5: Warning: \ + src/test/pkg/TestClass1.java:5: Error: \ android.provider.Settings.Secure#getInt() called from system process. \ Please call android.provider.Settings.Secure#getIntForUser() instead. \ [NonUserGetterCalled] final int value = Secure.getInt(context.getContentResolver(), - ^ - 0 errors, 1 warnings + ~~~~~~ + 1 errors, 0 warnings """.addLineContinuation() ) } @@ -100,13 +100,13 @@ class CallingSettingsNonUserGetterMethodsIssueDetectorTest : LintDetectorTest() .run() .expect( """ - src/test/pkg/TestClass1.java:5: Warning: \ + src/test/pkg/TestClass1.java:5: Error: \ android.provider.Settings.System#getFloat() called from system process. \ Please call android.provider.Settings.System#getFloatForUser() instead. \ [NonUserGetterCalled] final float value = System.getFloat(context.getContentResolver(), - ^ - 0 errors, 1 warnings + ~~~~~~~~ + 1 errors, 0 warnings """.addLineContinuation() ) } @@ -130,13 +130,13 @@ class CallingSettingsNonUserGetterMethodsIssueDetectorTest : LintDetectorTest() .run() .expect( """ - src/test/pkg/TestClass1.java:5: Warning: \ + src/test/pkg/TestClass1.java:5: Error: \ android.provider.Settings.System#getFloat() called from system process. \ Please call android.provider.Settings.System#getFloatForUser() instead. \ [NonUserGetterCalled] float value = Settings.System.getFloat(context.getContentResolver(), - ^ - 0 errors, 1 warnings + ~~~~~~~~ + 1 errors, 0 warnings """.addLineContinuation() ) } @@ -163,19 +163,19 @@ class CallingSettingsNonUserGetterMethodsIssueDetectorTest : LintDetectorTest() .run() .expect( """ - src/test/pkg/TestClass1.java:6: Warning: \ + src/test/pkg/TestClass1.java:6: Error: \ android.provider.Settings.Secure#getLong() called from system process. \ Please call android.provider.Settings.Secure#getLongForUser() instead. \ [NonUserGetterCalled] final long value1 = Secure.getLong(context.getContentResolver(), - ^ - src/test/pkg/TestClass1.java:8: Warning: \ + ~~~~~~~ + src/test/pkg/TestClass1.java:8: Error: \ android.provider.Settings.System#getString() called from system process. \ Please call android.provider.Settings.System#getStringForUser() instead. \ [NonUserGetterCalled] final String value2 = System.getString(context.getContentResolver(), - ^ - 0 errors, 2 warnings + ~~~~~~~~~ + 2 errors, 0 warnings """.addLineContinuation() ) } -- cgit v1.2.3-59-g8ed1b