Merge "Add custom Error Prone check for SDK comparisons." into rvc-dev am: 559130df3f am: a182ebd85f am: 8eea9f2c34 am: 095ebb723c

Change-Id: Idcf5856fdedc9ada4ea0f43f4e6d0c7134415efc

23 files changed, 29 insertions, 1 deletions

diff --git a/services/Android.bp b/services/Android.bp
index 3a6a538df4e3..2e70f1c528ee 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -1,3 +1,10 @@
+java_defaults {
+    name: "services_defaults",
+    plugins: [
+        "error_prone_android_framework",
+    ],
+}
+
 filegroup {
     name: "services-main-sources",
     srcs: ["java/**/*.java"],
@@ -83,7 +90,6 @@ java_library {
 
     // Uncomment to enable output of certain warnings (deprecated, unchecked)
     //javacflags: ["-Xlint"],
-
 }
 
 // native library
diff --git a/services/accessibility/Android.bp b/services/accessibility/Android.bp
index 284a2f2626a4..21a0c7489827 100644
--- a/services/accessibility/Android.bp
+++ b/services/accessibility/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.accessibility",
+    defaults: ["services_defaults"],
     srcs: [":services.accessibility-sources"],
     libs: ["services.core"],
 }
diff --git a/services/appprediction/Android.bp b/services/appprediction/Android.bp
index e14e1df0b5c7..c12f62fc6cd1 100644
--- a/services/appprediction/Android.bp
+++ b/services/appprediction/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.appprediction",
+    defaults: ["services_defaults"],
     srcs: [":services.appprediction-sources"],
     libs: ["services.core"],
 }
diff --git a/services/appwidget/Android.bp b/services/appwidget/Android.bp
index 54cf6cec78ea..83a9aa493bb0 100644
--- a/services/appwidget/Android.bp
+++ b/services/appwidget/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.appwidget",
+    defaults: ["services_defaults"],
     srcs: [":services.appwidget-sources"],
     libs: ["services.core"],
 }
diff --git a/services/autofill/Android.bp b/services/autofill/Android.bp
index 539eb1a5220e..1e65e8459edf 100644
--- a/services/autofill/Android.bp
+++ b/services/autofill/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.autofill",
+    defaults: ["services_defaults"],
     srcs: [":services.autofill-sources"],
     libs: ["services.core"],
 }
diff --git a/services/backup/Android.bp b/services/backup/Android.bp
index f02da2076706..56b788e34d35 100644
--- a/services/backup/Android.bp
+++ b/services/backup/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.backup",
+    defaults: ["services_defaults"],
     srcs: [":services.backup-sources"],
     libs: ["services.core"],
     static_libs: ["backuplib"],
diff --git a/services/companion/Android.bp b/services/companion/Android.bp
index 9677a7d83bfb..e25104227b71 100644
--- a/services/companion/Android.bp
+++ b/services/companion/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.companion",
+    defaults: ["services_defaults"],
     srcs: [":services.companion-sources"],
     libs: ["services.core"],
 }
diff --git a/services/contentcapture/Android.bp b/services/contentcapture/Android.bp
index 96e20726fed3..7006430067ec 100644
--- a/services/contentcapture/Android.bp
+++ b/services/contentcapture/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.contentcapture",
+    defaults: ["services_defaults"],
     srcs: [":services.contentcapture-sources"],
     libs: ["services.core"],
 }
diff --git a/services/contentsuggestions/Android.bp b/services/contentsuggestions/Android.bp
index d17f06f79e97..3fe3cd252592 100644
--- a/services/contentsuggestions/Android.bp
+++ b/services/contentsuggestions/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.contentsuggestions",
+    defaults: ["services_defaults"],
     srcs: [":services.contentsuggestions-sources"],
     libs: ["services.core"],
 }
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 6eab0905f4ad..4335d3399e12 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -148,6 +148,7 @@ java_genrule {
 
 java_library {
     name: "services.core",
+    defaults: ["services_defaults"],
     static_libs: ["services.core.priorityboosted"],
 }
 
diff --git a/services/coverage/Android.bp b/services/coverage/Android.bp
index e4f54644df46..df054b006cd3 100644
--- a/services/coverage/Android.bp
+++ b/services/coverage/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.coverage",
+    defaults: ["services_defaults"],
     srcs: [":services.coverage-sources"],
     libs: ["jacocoagent"],
 }
diff --git a/services/devicepolicy/Android.bp b/services/devicepolicy/Android.bp
index 2f6592bd33b0..7a80fb1b8856 100644
--- a/services/devicepolicy/Android.bp
+++ b/services/devicepolicy/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.devicepolicy",
+    defaults: ["services_defaults"],
     srcs: [":services.devicepolicy-sources"],
 
     libs: [
diff --git a/services/midi/Android.bp b/services/midi/Android.bp
index 20e00834d0ad..6bce5b51ecb7 100644
--- a/services/midi/Android.bp
+++ b/services/midi/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.midi",
+    defaults: ["services_defaults"],
     srcs: [":services.midi-sources"],
     libs: ["services.core"],
 }
diff --git a/services/net/Android.bp b/services/net/Android.bp
index 8b444b0fed41..afea1a073cab 100644
--- a/services/net/Android.bp
+++ b/services/net/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.net",
+    defaults: ["services_defaults"],
     srcs: [
         ":net-module-utils-srcs",
         ":services.net-sources",
diff --git a/services/people/Android.bp b/services/people/Android.bp
index d64097a03ae9..c863f1f5919f 100644
--- a/services/people/Android.bp
+++ b/services/people/Android.bp
@@ -1,5 +1,6 @@
 java_library_static {
     name: "services.people",
+    defaults: ["services_defaults"],
     srcs: ["java/**/*.java"],
     libs: ["services.core"],
 }
diff --git a/services/print/Android.bp b/services/print/Android.bp
index aad24d72345b..93b5ef040926 100644
--- a/services/print/Android.bp
+++ b/services/print/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.print",
+    defaults: ["services_defaults"],
     srcs: [":services.print-sources"],
     libs: ["services.core"],
 }
diff --git a/services/restrictions/Android.bp b/services/restrictions/Android.bp
index 805858f7f654..28830956e7f5 100644
--- a/services/restrictions/Android.bp
+++ b/services/restrictions/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.restrictions",
+    defaults: ["services_defaults"],
     srcs: [":services.restrictions-sources"],
     libs: ["services.core"],
 }
diff --git a/services/startop/Android.bp b/services/startop/Android.bp
index 093b4ec66ddf..46a81aae63c5 100644
--- a/services/startop/Android.bp
+++ b/services/startop/Android.bp
@@ -16,6 +16,7 @@
 
 java_library_static {
     name: "services.startop",
+    defaults: ["services_defaults"],
 
     static_libs: [
         // frameworks/base/startop/iorap
diff --git a/services/systemcaptions/Android.bp b/services/systemcaptions/Android.bp
index 1ce3e665c665..54968c003560 100644
--- a/services/systemcaptions/Android.bp
+++ b/services/systemcaptions/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.systemcaptions",
+    defaults: ["services_defaults"],
     srcs: [":services.systemcaptions-sources"],
     libs: ["services.core"],
 }
diff --git a/services/usage/Android.bp b/services/usage/Android.bp
index 156bf330c128..463673f104ab 100644
--- a/services/usage/Android.bp
+++ b/services/usage/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.usage",
+    defaults: ["services_defaults"],
     srcs: [":services.usage-sources"],
     libs: ["services.core"],
 }
diff --git a/services/usb/Android.bp b/services/usb/Android.bp
index a9474c10017e..4e984093cfec 100644
--- a/services/usb/Android.bp
+++ b/services/usb/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.usb",
+    defaults: ["services_defaults"],
     srcs: [":services.usb-sources"],
 
     libs: [
diff --git a/services/voiceinteraction/Android.bp b/services/voiceinteraction/Android.bp
index 85b96f34f4f6..47129ad62e86 100644
--- a/services/voiceinteraction/Android.bp
+++ b/services/voiceinteraction/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.voiceinteraction",
+    defaults: ["services_defaults"],
     srcs: [":services.voiceinteraction-sources"],
     libs: ["services.core"],
 }
diff --git a/services/wifi/Android.bp b/services/wifi/Android.bp
index f56c2cf76956..3975fd238bb5 100644
--- a/services/wifi/Android.bp
+++ b/services/wifi/Android.bp
@@ -7,6 +7,7 @@ filegroup {
 
 java_library_static {
     name: "services.wifi",
+    defaults: ["services_defaults"],
     srcs: [
         ":services.wifi-sources",
     ],