Merge "Improving output in GarageMode dump for debugging" into main
diff --git a/car-lib/api/lint-baseline.txt b/car-lib/api/lint-baseline.txt
index 0949c8e..fd77676 100644
--- a/car-lib/api/lint-baseline.txt
+++ b/car-lib/api/lint-baseline.txt
@@ -189,8 +189,6 @@
Fully-static utility classes must not have constructor
-VisiblySynchronized: PsiThisExpression:
- Internal locks must not be exposed (synchronizing on this or class is still externally observable): method android.car.CarAppFocusManager.addFocusListener(android.car.CarAppFocusManager.OnAppFocusChangedListener,int)
VisiblySynchronized: android.car.CarAppFocusManager#abandonAppFocus(android.car.CarAppFocusManager.OnAppFocusOwnershipCallback):
Internal locks must not be exposed (synchronizing on this or class is still externally observable): method android.car.CarAppFocusManager.abandonAppFocus(android.car.CarAppFocusManager.OnAppFocusOwnershipCallback)
VisiblySynchronized: android.car.CarAppFocusManager#abandonAppFocus(android.car.CarAppFocusManager.OnAppFocusOwnershipCallback, int):
diff --git a/experimental/service/Android.bp b/experimental/service/Android.bp
index 2860fb1..8ba1eca 100644
--- a/experimental/service/Android.bp
+++ b/experimental/service/Android.bp
@@ -43,9 +43,12 @@
libs: ["android.car"],
static_libs: [
- "car-service-common-util-static-lib",
- "car-experimental-api-static-lib",
+ "car-service-common-util-static-lib",
+ "car-experimental-api-static-lib",
],
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
//####################################################################################
@@ -64,9 +67,12 @@
],
static_libs: [
- "car-service-common-util-static-lib",
- "car-experimental-api-static-lib",
+ "car-service-common-util-static-lib",
+ "car-experimental-api-static-lib",
],
min_sdk_version: "25",
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
diff --git a/service/Android.bp b/service/Android.bp
index b0ea598..5c6f34e 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -23,8 +23,8 @@
genrule {
name: "statslog-Car-java-gen",
tools: ["stats-log-api-gen"],
- cmd: "$(location stats-log-api-gen) --java $(out) --module car --javaPackage com.android.car"
- + " --javaClass CarStatsLog",
+ cmd: "$(location stats-log-api-gen) --java $(out) --module car --javaPackage com.android.car" +
+ " --javaClass CarStatsLog",
out: ["com/android/car/CarStatsLog.java"],
}
@@ -43,7 +43,7 @@
":iscriptexecutor_aidl",
"proto/**/*.proto",
"src/**/*.java",
- ],
+ ],
aidl: {
include_dirs: [
@@ -74,7 +74,7 @@
],
static_libs: [
- "android.automotive.telemetry.internal-V2-java", // ICarTelemetryInternal
+ "android.automotive.telemetry.internal-V2-java", // ICarTelemetryInternal
"android.automotive.watchdog.internal-V3-java",
"android.frameworks.automotive.powerpolicy.internal-V1-java",
"android.frameworks.automotive.powerpolicy-V2-java",
@@ -114,7 +114,7 @@
"//packages/services/Car:__subpackages__",
],
- defaults: [ "carservice-updatable-min-java-defaults" ],
+ defaults: ["carservice-updatable-min-java-defaults"],
// TODO(b/288271411): enable it when car mainline module is supported
// min_sdk_version: "33",
@@ -128,6 +128,9 @@
privileged: true,
required: ["allowed_privapp_com.android.car"],
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
// Added to car.framework module
@@ -138,6 +141,9 @@
privileged: true,
apex_available: ["com.android.car.framework"],
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
java_library {
@@ -161,6 +167,9 @@
"android.hardware.automotive.vehicle-V2-java",
"android.hardware.automotive.vehicle-V2.0-java",
],
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
// Minimum code shared with carservice builtin.
@@ -174,8 +183,11 @@
],
libs: [
- "android.car",
+ "android.car",
],
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
//####################################################################################
@@ -187,7 +199,10 @@
defaults: ["carservice-updatable-min-java-defaults"],
- manifest: "EmptyAndroidManifest.xml"
+ manifest: "EmptyAndroidManifest.xml",
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
filegroup {
diff --git a/tests/EmbeddedKitchenSinkApp/OWNERS b/tests/EmbeddedKitchenSinkApp/OWNERS
index 83d2a52..bcff606 100644
--- a/tests/EmbeddedKitchenSinkApp/OWNERS
+++ b/tests/EmbeddedKitchenSinkApp/OWNERS
@@ -1,3 +1,7 @@
+# TLs
+dnek@google.com
+igorr@google.com
+
# Audio
per-file src/com/google/android/car/kitchensink/AudioAutoStartActivity.java = oscarazu@google.com, ericjeong@google.com
per-file src/com/google/android/car/kitchensink/audio/* = oscarazu@google.com, ericjeong@google.com
@@ -21,6 +25,18 @@
# Power
per-file src/com/google/android/car/kitchensink/power/* = ericjeong@google.com
+# Radio
+per-file src/com/google/android/car/kitchensink/radio/* = xuweilin@google.com, oscarazu@google.com, ericjeong@google.com
+
# Watchdog
per-file src/com/google/android/car/kitchensink/CarWatchdogClient.java = lakshmana@google.com
per-file src/com/google/android/car/kitchensink/watchdog/* = lakshmana@google.com
+
+# Property
+per-file src/com/google/android/car/kitchensink/property/* = ericjeong@google.com, tylertrephan@google.com, shanyu@google.com
+
+# Sensor
+per-file src/com/google/android/car/kitchensink/sensor/* = ericjeong@google.com, tylertrephan@google.com, evaschen@google.com
+
+# res folder
+per-file res/** = oscarazu@google.com, salsavage@google.com, chengandrew@google.com, twasilczyk@google.com, xuweilin@google.com, lakshmana@google.com, tylertrephan@google.com, shanyu@google.com, evaschen@google.com
diff --git a/tests/carservice_unit_test/OWNERS b/tests/carservice_unit_test/OWNERS
index 868bd66..0fb9fcc 100644
--- a/tests/carservice_unit_test/OWNERS
+++ b/tests/carservice_unit_test/OWNERS
@@ -40,7 +40,11 @@
# Property
per-file src/com/android/car/CarProperty* = ericjeong@google.com, tylertrephan@google.com, shanyu@google.com
per-file src/com/android/car/hal/PropertyHalServiceTest.java = ericjeong@google.com, tylertrephan@google.com, shanyu@google.com
-per-file src/com/android/car/hal/PropertyHalServiceIdsTest.java = ericjeong@google.com, tylertrephan@google.com, shanyu@google.com
+per-file src/com/android/car/hal/property/*.java = ericjeong@google.com, tylertrephan@google.com, shanyu@google.com
+per-file src/com/android/car/property/*.java = ericjeong@google.com, tylertrephan@google.com, shanyu@google.com
+per-file src/com/android/car/internal/property/*.java = ericjeong@google.com, tylertrephan@google.com, shanyu@google.com
+per-file src/com/android/car/internal/util/PairSparseArrayUnitTest.java = aaqibismail@google.com, tylertrephan@google.com, shanyu@google.com
+per-file src/android/car/hardware/property/*.java = aaqibismail@google.com, tylertrephan@google.com, shanyu@google.com
# StorageMonitoring
per-file src/com/android/car/storagemonitoring/* = lakshmana@google.com
@@ -63,3 +67,6 @@
per-file src/com/android/car/hal/Hal*.java = ericjeong@google.com, tylertrephan@google.com, shanyu@google.com
per-file src/com/android/car/hal/VehicleHal*.java = ericjeong@google.com, tylertrephan@google.com, shanyu@google.com
per-file src/com/android/car/*VehicleStubUnitTest.java = ericjeong@google.com, tylertrephan@google.com, shanyu@google.com
+
+# res folder
+per-file res/** = oscarazu@google.com, salsavage@google.com, chengandrew@google.com, kanant@google.com, tylertrephan@google.com, shanyu@google.com, aaqibismail@google.com, lakshmana@google.com, jahdiel@google.com
