Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[lint] treat non-user getter calls as lint errors with baselines to exempt existing failures"

Browse Source 
This reverts commit ddea459a65.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=errorprone&lkgb=7670042&lkbb=7670063&fkbb=7670063, bug 197639027

Change-Id: Ic45c5a1a5415570000c1c1de7868f005613281c2
This commit is contained in:
Kevin Jeon
2021-08-24 16:39:11 +00:00
parent ddea459a65
commit 88dd20e6d4
5 changed files with 16 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/backup/lint-baseline.xml
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 7.1.0-dev" type="baseline" client="" dependencies="true" name="" variant="all" version="7.1.0-dev">
<issue
id="NonUserGetterCalled"
message="`android.provider.Settings.Secure#getInt()` called from system process. Please call `android.provider.Settings.Secure#getIntForUser()` instead. "
errorLine1=" return Settings.Secure.getInt(mContext.getContentResolver(), SKIP_USER_FACING_PACKAGES,"
errorLine2=" ~~~~~~">
<location
file="frameworks/base/services/backup/java/com/android/server/backup/UserBackupManagerService.java"
line="3702"
column="16"/>
</issue>
</issues>

15
services/companion/lint-baseline.xml
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 7.1.0-dev" type="baseline" client="" dependencies="true" name="" variant="all" version="7.1.0-dev">
<issue
id="NonUserGetterCalled"
message="`android.provider.Settings.Secure#getString()` called from system process. Please call `android.provider.Settings.Secure#getStringForUser()` instead. "
errorLine1=" String setting = Settings.Secure.getString(getContext().getContentResolver(),"
errorLine2=" ~~~~~~~~~">
<location
file="frameworks/base/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java"
line="590"
column="14"/>
</issue>
</issues>

15
services/usb/lint-baseline.xml
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 7.1.0-dev" type="baseline" client="" dependencies="true" name="" variant="all" version="7.1.0-dev">
<issue
id="NonUserGetterCalled"
message="`android.provider.Settings.Secure#getInt()` called from system process. Please call `android.provider.Settings.Secure#getIntForUser()` instead. "
errorLine1=" int isDisabled = Settings.Secure.getInt(mContext.getContentResolver(),"
errorLine2=" ~~~~~~">
<location
file="frameworks/base/services/usb/java/com/android/server/usb/UsbAlsaManager.java"
line="150"
column="42"/>
</issue>
</issues>

5
tools/lint/checks/src/main/java/com/google/android/lint/CallingSettingsNonUserGetterMethodsDetector.kt
View File

@@ -45,8 +45,7 @@ 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.getNameLocation(node),
message)
context.report(ISSUE_NON_USER_GETTER_CALLED, node, context.getLocation(node), message)
}
}
@@ -69,7 +68,7 @@ class CallingSettingsNonUserGetterMethodsDetector : Detector(), SourceCodeScanne
""",
category = Category.CORRECTNESS,
priority = 6,
severity = Severity.ERROR,
severity = Severity.WARNING,
implementation = Implementation(
CallingSettingsNonUserGetterMethodsDetector::class.java,
Scope.JAVA_FILE_SCOPE

28
tools/lint/checks/src/test/java/com/google/android/lint/CallingSettingsNonUserGetterMethodsIssueDetectorTest.kt
View File

@@ -71,13 +71,13 @@ class CallingSettingsNonUserGetterMethodsIssueDetectorTest : LintDetectorTest()
.run()
.expect(
"""
src/test/pkg/TestClass1.java:5: Error: \
src/test/pkg/TestClass1.java:5: Warning: \
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(),
~~~~~~
1 errors, 0 warnings
^
0 errors, 1 warnings
""".addLineContinuation()
)
}
@@ -100,13 +100,13 @@ class CallingSettingsNonUserGetterMethodsIssueDetectorTest : LintDetectorTest()
.run()
.expect(
"""
src/test/pkg/TestClass1.java:5: Error: \
src/test/pkg/TestClass1.java:5: Warning: \
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(),
~~~~~~~~
1 errors, 0 warnings
^
0 errors, 1 warnings
""".addLineContinuation()
)
}
@@ -130,13 +130,13 @@ class CallingSettingsNonUserGetterMethodsIssueDetectorTest : LintDetectorTest()
.run()
.expect(
"""
src/test/pkg/TestClass1.java:5: Error: \
src/test/pkg/TestClass1.java:5: Warning: \
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(),
~~~~~~~~
1 errors, 0 warnings
^
0 errors, 1 warnings
""".addLineContinuation()
)
}
@@ -163,19 +163,19 @@ class CallingSettingsNonUserGetterMethodsIssueDetectorTest : LintDetectorTest()
.run()
.expect(
"""
src/test/pkg/TestClass1.java:6: Error: \
src/test/pkg/TestClass1.java:6: Warning: \
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: Error: \
^
src/test/pkg/TestClass1.java:8: Warning: \
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(),
~~~~~~~~~
2 errors, 0 warnings
^
0 errors, 2 warnings
""".addLineContinuation()
)
}