Merge "Enable Error Prone to detect obscure bugs."

2020-10-24 17:06:45 +00:00
parent 7f7a8d7bbb d23b5379c0
commit f7dee0be43
50 changed files with 80 additions and 40 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,37 @@

 // Build the master framework library.

+// Defaults for platform code that runs inside system_server
+java_defaults {
+    name: "platform_service_defaults",
+    plugins: [
+        "error_prone_android_framework",
+    ],
+    errorprone: {
+        javacflags: [
+            "-Xep:AndroidFrameworkBinderIdentity:ERROR",
+            "-Xep:AndroidFrameworkCompatChange:ERROR",
+            "-Xep:AndroidFrameworkUid:ERROR",
+        ],
+    },
+}
+
+// Defaults for platform apps
+java_defaults {
+    name: "platform_app_defaults",
+    plugins: [
+        "error_prone_android_framework",
+    ],
+    errorprone: {
+        javacflags: [
+            // We're less worried about performance in app code
+            "-Xep:AndroidFrameworkEfficientCollections:OFF",
+            "-Xep:AndroidFrameworkEfficientParcelable:OFF",
+            "-Xep:AndroidFrameworkEfficientStrings:OFF",
+        ],
+    },
+}
+
 // READ ME: ########################################################
 //
 // When updating this list of aidl files, consider if that aidl is
--- a/packages/BackupEncryption/Android.bp
+++ b/packages/BackupEncryption/Android.bp
@@ -16,6 +16,7 @@

 android_app {
    name: "BackupEncryption",
+    defaults: ["platform_app_defaults"],
    srcs: ["src/**/*.java"],
    static_libs: ["backup-encryption-protos", "backuplib"],
    optimize: { enabled: false },
--- a/packages/BackupRestoreConfirmation/Android.bp
+++ b/packages/BackupRestoreConfirmation/Android.bp
@@ -16,6 +16,7 @@

 android_app {
    name: "BackupRestoreConfirmation",
+    defaults: ["platform_app_defaults"],
    srcs: ["src/**/*.java"],
    platform_apis: true,
    certificate: "platform",
--- a/packages/CompanionDeviceManager/Android.bp
+++ b/packages/CompanionDeviceManager/Android.bp
@@ -14,6 +14,7 @@

 android_app {
    name: "CompanionDeviceManager",
+    defaults: ["platform_app_defaults"],
    srcs: ["src/**/*.java"],

    platform_apis: true,
--- a/packages/DynamicSystemInstallationService/Android.bp
+++ b/packages/DynamicSystemInstallationService/Android.bp
@@ -1,5 +1,6 @@
 android_app {
    name: "DynamicSystemInstallationService",
+    defaults: ["platform_app_defaults"],

    srcs: ["src/**/*.java"],
    resource_dirs: ["res"],
--- a/packages/EncryptedLocalTransport/Android.bp
+++ b/packages/EncryptedLocalTransport/Android.bp
@@ -16,6 +16,7 @@

 android_app {
    name: "EncryptedLocalTransport",
+    defaults: ["platform_app_defaults"],
    srcs: ["src/**/*.java"],
    optimize: {
        proguard_flags_files: ["proguard.flags"],
--- a/packages/ExtShared/Android.bp
+++ b/packages/ExtShared/Android.bp
@@ -14,6 +14,7 @@

 android_app {
    name: "ExtShared",
+    defaults: ["platform_app_defaults"],
    srcs: ["src/**/*.java"],
    sdk_version: "current",
    certificate: "platform",
--- a/packages/ExternalStorageProvider/Android.bp
+++ b/packages/ExternalStorageProvider/Android.bp
@@ -1,5 +1,6 @@
 android_app {
    name: "ExternalStorageProvider",
+    defaults: ["platform_app_defaults"],

    manifest: "AndroidManifest.xml",

--- a/packages/FakeOemFeatures/Android.bp
+++ b/packages/FakeOemFeatures/Android.bp
@@ -1,5 +1,6 @@
 android_app {
    name: "FakeOemFeatures",
+    defaults: ["platform_app_defaults"],
    srcs: ["src/**/*.java"],
    platform_apis: true,
    certificate: "platform",
--- a/packages/FusedLocation/Android.bp
+++ b/packages/FusedLocation/Android.bp
@@ -14,6 +14,7 @@

 android_app {
    name: "FusedLocation",
+    defaults: ["platform_app_defaults"],
    srcs: ["src/**/*.java"],
    libs: ["com.android.location.provider"],
    platform_apis: true,
@@ -45,4 +46,4 @@ android_test {
    platform_apis: true,
    certificate: "platform",
    test_suites: ["device-tests"]
-}
+}
--- a/packages/InputDevices/Android.bp
+++ b/packages/InputDevices/Android.bp
@@ -14,6 +14,7 @@

 android_app {
    name: "InputDevices",
+    defaults: ["platform_app_defaults"],

    srcs: [
        "**/*.java",
--- a/packages/LocalTransport/Android.bp
+++ b/packages/LocalTransport/Android.bp
@@ -16,6 +16,7 @@

 android_app {
    name: "LocalTransport",
+    defaults: ["platform_app_defaults"],
    srcs: ["src/**/*.java"],
    optimize: {
        proguard_flags_files: ["proguard.flags"],
--- a/packages/PackageInstaller/Android.bp
+++ b/packages/PackageInstaller/Android.bp
@@ -14,6 +14,7 @@

 android_app {
    name: "PackageInstaller",
+    defaults: ["platform_app_defaults"],

    srcs: ["src/**/*.java"],

--- a/packages/PrintRecommendationService/Android.bp
+++ b/packages/PrintRecommendationService/Android.bp
@@ -14,6 +14,7 @@

 android_app {
    name: "PrintRecommendationService",
+    defaults: ["platform_app_defaults"],
    srcs: ["src/**/*.java"],
    sdk_version: "system_current",
    static_libs: [
--- a/packages/PrintSpooler/Android.bp
+++ b/packages/PrintSpooler/Android.bp
@@ -14,6 +14,7 @@

 android_app {
    name: "PrintSpooler",
+    defaults: ["platform_app_defaults"],

    resource_dirs: ["res"],

--- a/packages/SettingsProvider/Android.bp
+++ b/packages/SettingsProvider/Android.bp
@@ -1,5 +1,6 @@
 android_app {
    name: "SettingsProvider",
+    defaults: ["platform_app_defaults"],
    resource_dirs: ["res"],
    srcs: [
        "src/**/*.java",
--- a/packages/SharedStorageBackup/Android.bp
+++ b/packages/SharedStorageBackup/Android.bp
@@ -16,6 +16,7 @@

 android_app {
    name: "SharedStorageBackup",
+    defaults: ["platform_app_defaults"],
    srcs: ["src/**/*.java"],
    optimize: {
        proguard_flags_files: ["proguard.flags"],
--- a/packages/Shell/Android.bp
+++ b/packages/Shell/Android.bp
@@ -1,5 +1,6 @@
 android_app {
    name: "Shell",
+    defaults: ["platform_app_defaults"],
    srcs: ["src/**/*.java",":dumpstate_aidl"],
    aidl: {
        include_dirs: ["frameworks/native/cmds/dumpstate/binder"],
--- a/packages/SimAppDialog/Android.bp
+++ b/packages/SimAppDialog/Android.bp
@@ -1,5 +1,6 @@
 android_app {
    name: "SimAppDialog",
+    defaults: ["platform_app_defaults"],

    srcs: ["src/**/*.java"],

--- a/packages/SoundPicker/Android.bp
+++ b/packages/SoundPicker/Android.bp
@@ -1,5 +1,6 @@
 android_app {
    name: "SoundPicker",
+    defaults: ["platform_app_defaults"],
    manifest: "AndroidManifest.xml",

    static_libs: [
--- a/packages/StatementService/Android.bp
+++ b/packages/StatementService/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 android_app {
    name: "StatementService",
+    defaults: ["platform_app_defaults"],
    srcs: ["src/**/*.java"],
    optimize: {
        proguard_flags_files: ["proguard.flags"],
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -163,6 +163,7 @@ android_library {

 android_app {
    name: "SystemUI",
+    defaults: ["platform_app_defaults"],
    static_libs: [
        "SystemUI-core",
    ],
@@ -184,5 +185,4 @@ android_app {
        "privapp_whitelist_com.android.systemui",
        "checked-wm_shell_protolog.json",
    ],
-
 }
--- a/packages/WAPPushManager/Android.bp
+++ b/packages/WAPPushManager/Android.bp
@@ -2,6 +2,7 @@

 android_app {
    name: "WAPPushManager",
+    defaults: ["platform_app_defaults"],
    srcs: ["src/**/*.java"],
    platform_apis: true,
    libs: ["telephony-common"],
--- a/packages/WallpaperBackup/Android.bp
+++ b/packages/WallpaperBackup/Android.bp
@@ -16,6 +16,7 @@

 android_app {
    name: "WallpaperBackup",
+    defaults: ["platform_app_defaults"],
    srcs: ["src/**/*.java"],
    optimize: {
        proguard_flags_files: ["proguard.flags"],
--- a/packages/WallpaperCropper/Android.bp
+++ b/packages/WallpaperCropper/Android.bp
@@ -1,5 +1,6 @@
 android_app {
    name: "WallpaperCropper",
+    defaults: ["platform_app_defaults"],
    srcs: ["src/**/*.java"],
    platform_apis: true,
    certificate: "platform",
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -1,17 +1,3 @@
-java_defaults {
-    name: "services_defaults",
-    plugins: [
-        "error_prone_android_framework",
-    ],
-    errorprone: {
-        javacflags: [
-            "-Xep:AndroidFrameworkBinderIdentity:ERROR",
-            "-Xep:AndroidFrameworkCompatChange:ERROR",
-            "-Xep:AndroidFrameworkUid:ERROR",
-        ],
-    },
-}
-
 filegroup {
    name: "services-main-sources",
    srcs: ["java/**/*.java"],
--- a/services/accessibility/Android.bp
+++ b/services/accessibility/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.accessibility",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.accessibility-sources"],
    libs: ["services.core"],
 }
--- a/services/appprediction/Android.bp
+++ b/services/appprediction/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.appprediction",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.appprediction-sources"],
    libs: ["services.core"],
 }
--- a/services/appwidget/Android.bp
+++ b/services/appwidget/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.appwidget",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.appwidget-sources"],
    libs: ["services.core"],
 }
--- a/services/autofill/Android.bp
+++ b/services/autofill/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.autofill",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.autofill-sources"],
    libs: ["services.core"],
 }
--- a/services/backup/Android.bp
+++ b/services/backup/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.backup",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.backup-sources"],
    libs: ["services.core"],
    static_libs: ["backuplib"],
--- a/services/companion/Android.bp
+++ b/services/companion/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.companion",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.companion-sources"],
    libs: ["services.core"],
 }
--- a/services/contentcapture/Android.bp
+++ b/services/contentcapture/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.contentcapture",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.contentcapture-sources"],
    libs: ["services.core"],
 }
--- a/services/contentsuggestions/Android.bp
+++ b/services/contentsuggestions/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.contentsuggestions",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.contentsuggestions-sources"],
    libs: ["services.core"],
 }
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -144,7 +144,7 @@ java_genrule {

 java_library {
    name: "services.core",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    static_libs: ["services.core.priorityboosted"],
 }

--- a/services/coverage/Android.bp
+++ b/services/coverage/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.coverage",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.coverage-sources"],
    libs: ["jacocoagent"],
 }
--- a/services/devicepolicy/Android.bp
+++ b/services/devicepolicy/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.devicepolicy",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.devicepolicy-sources"],

    libs: [
--- a/services/midi/Android.bp
+++ b/services/midi/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.midi",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.midi-sources"],
    libs: ["services.core"],
 }
--- a/services/musicrecognition/Android.bp
+++ b/services/musicrecognition/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.musicsearch",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.musicsearch-sources"],
    libs: ["services.core", "app-compat-annotations"],
 }
--- a/services/net/Android.bp
+++ b/services/net/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.net",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [
        ":net-module-utils-srcs",
        ":services.net-sources",
--- a/services/people/Android.bp
+++ b/services/people/Android.bp
@@ -1,6 +1,6 @@
 java_library_static {
    name: "services.people",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: ["java/**/*.java"],
    libs: ["services.core"],
 }
--- a/services/print/Android.bp
+++ b/services/print/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.print",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.print-sources"],
    libs: ["services.core"],
 }
--- a/services/profcollect/Android.bp
+++ b/services/profcollect/Android.bp
@@ -30,7 +30,7 @@ filegroup {

 java_library_static {
  name: "services.profcollect",
-  defaults: ["services_defaults"],
+  defaults: ["platform_service_defaults"],
  srcs: [":services.profcollect-sources"],
  libs: ["services.core"],
 }
--- a/services/restrictions/Android.bp
+++ b/services/restrictions/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.restrictions",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.restrictions-sources"],
    libs: ["services.core"],
 }
--- a/services/startop/Android.bp
+++ b/services/startop/Android.bp
@@ -16,7 +16,7 @@

 java_library_static {
    name: "services.startop",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],

    static_libs: [
        // frameworks/base/startop/iorap
--- a/services/systemcaptions/Android.bp
+++ b/services/systemcaptions/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.systemcaptions",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.systemcaptions-sources"],
    libs: ["services.core"],
 }
--- a/services/usage/Android.bp
+++ b/services/usage/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.usage",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.usage-sources"],
    libs: ["services.core"],
 }
--- a/services/usb/Android.bp
+++ b/services/usb/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.usb",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.usb-sources"],

    libs: [
--- a/services/voiceinteraction/Android.bp
+++ b/services/voiceinteraction/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.voiceinteraction",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [":services.voiceinteraction-sources"],
    libs: ["services.core"],
 }
--- a/services/wifi/Android.bp
+++ b/services/wifi/Android.bp
@@ -7,7 +7,7 @@ filegroup {

 java_library_static {
    name: "services.wifi",
-    defaults: ["services_defaults"],
+    defaults: ["platform_service_defaults"],
    srcs: [
        ":services.wifi-sources",
    ],