Skip QD1A.190821.011 in stage-aosp-master
Bug: 141248619
Change-Id: I5571fa875fc0e9603f4a7f35b1c41260eebb0185
diff --git a/OWNERS b/OWNERS
index 5c34983..70e48e5 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,6 @@
+per-file *.hal,*.aidl,OWNERS = set noparent
+per-file *.hal,*.aidl,OWNERS = elsk@google.com,malchev@google.com,smoreland@google.com
+
elsk@google.com
maco@google.com
malchev@google.com
diff --git a/bufferhub/1.0/Android.bp b/bufferhub/1.0/Android.bp
index 0412851..741709f 100644
--- a/bufferhub/1.0/Android.bp
+++ b/bufferhub/1.0/Android.bp
@@ -16,4 +16,3 @@
],
gen_java: true,
}
-
diff --git a/bufferhub/1.0/vts/functional/Android.bp b/bufferhub/1.0/vts/functional/Android.bp
index 22b16d6..f1538c1 100644
--- a/bufferhub/1.0/vts/functional/Android.bp
+++ b/bufferhub/1.0/vts/functional/Android.bp
@@ -32,7 +32,6 @@
"android.frameworks.bufferhub@1.0",
"libcutils",
"libhidlbase",
- "libhwbinder",
"liblog",
"libui",
"libutils",
diff --git a/cameraservice/common/2.0/Android.bp b/cameraservice/common/2.0/Android.bp
index be24a34..b58d2fc 100644
--- a/cameraservice/common/2.0/Android.bp
+++ b/cameraservice/common/2.0/Android.bp
@@ -11,4 +11,3 @@
],
gen_java: true,
}
-
diff --git a/cameraservice/device/2.0/Android.bp b/cameraservice/device/2.0/Android.bp
index 07ad81e..a37ac64 100644
--- a/cameraservice/device/2.0/Android.bp
+++ b/cameraservice/device/2.0/Android.bp
@@ -17,4 +17,3 @@
],
gen_java: false,
}
-
diff --git a/cameraservice/service/2.0/Android.bp b/cameraservice/service/2.0/Android.bp
index f1a1bae..8e04217 100644
--- a/cameraservice/service/2.0/Android.bp
+++ b/cameraservice/service/2.0/Android.bp
@@ -18,4 +18,3 @@
],
gen_java: false,
}
-
diff --git a/displayservice/1.0/Android.bp b/displayservice/1.0/Android.bp
index db37617..0ce1732 100644
--- a/displayservice/1.0/Android.bp
+++ b/displayservice/1.0/Android.bp
@@ -17,4 +17,3 @@
],
gen_java: true,
}
-
diff --git a/displayservice/1.0/vts/functional/Android.bp b/displayservice/1.0/vts/functional/Android.bp
index 0597cf3..a148f8a 100644
--- a/displayservice/1.0/vts/functional/Android.bp
+++ b/displayservice/1.0/vts/functional/Android.bp
@@ -20,7 +20,6 @@
shared_libs: [
"android.frameworks.displayservice@1.0",
"libhidlbase",
- "libhidltransport",
"liblog",
"libutils",
],
diff --git a/schedulerservice/1.0/Android.bp b/schedulerservice/1.0/Android.bp
index 118ee2c..7dbfb17 100644
--- a/schedulerservice/1.0/Android.bp
+++ b/schedulerservice/1.0/Android.bp
@@ -14,4 +14,3 @@
],
gen_java: true,
}
-
diff --git a/sensorservice/1.0/Android.bp b/sensorservice/1.0/Android.bp
index e6e039d..a7d6d50 100644
--- a/sensorservice/1.0/Android.bp
+++ b/sensorservice/1.0/Android.bp
@@ -19,4 +19,3 @@
],
gen_java: false,
}
-
diff --git a/sensorservice/libsensorndkbridge/Android.bp b/sensorservice/libsensorndkbridge/Android.bp
index cb4210c..a2b5061 100644
--- a/sensorservice/libsensorndkbridge/Android.bp
+++ b/sensorservice/libsensorndkbridge/Android.bp
@@ -24,7 +24,6 @@
shared_libs: [
"libbase",
"libhidlbase",
- "libhidltransport",
"libutils",
"android.frameworks.sensorservice@1.0",
"android.hardware.sensors@1.0",
diff --git a/stats/1.0/Android.bp b/stats/1.0/Android.bp
index ae435a3..aa4d500 100644
--- a/stats/1.0/Android.bp
+++ b/stats/1.0/Android.bp
@@ -15,4 +15,3 @@
],
gen_java: true,
}
-
diff --git a/stats/1.0/test_client/Android.bp b/stats/1.0/test_client/Android.bp
index c71c209..9ebb3b9 100644
--- a/stats/1.0/test_client/Android.bp
+++ b/stats/1.0/test_client/Android.bp
@@ -6,7 +6,6 @@
shared_libs: [
"libbase",
"libhidlbase",
- "libhidltransport",
"libmetricslogger",
"libutils",
"libstatslog",
diff --git a/stats/1.0/test_client/StatsClient.cpp b/stats/1.0/test_client/StatsClient.cpp
index 20257a8..b564161 100644
--- a/stats/1.0/test_client/StatsClient.cpp
+++ b/stats/1.0/test_client/StatsClient.cpp
@@ -141,8 +141,8 @@
break;
}
case 'u': {
- UsbPortOverheatEvent event = {.maxTemperatureDeciC = 220,
- .plugTemperatureDeciC = 210,
+ UsbPortOverheatEvent event = {.plugTemperatureDeciC = 210,
+ .maxTemperatureDeciC = 220,
.timeToOverheat = 1,
.timeToHysteresis = 2,
.timeToInactive = 3};
diff --git a/stats/1.0/vts/functional/VtsHalStatsV1_0TargetTest.cpp b/stats/1.0/vts/functional/VtsHalStatsV1_0TargetTest.cpp
index d7130f7..0c96c79 100644
--- a/stats/1.0/vts/functional/VtsHalStatsV1_0TargetTest.cpp
+++ b/stats/1.0/vts/functional/VtsHalStatsV1_0TargetTest.cpp
@@ -128,8 +128,8 @@
// Sanity check IStats::reportUsbPortOverheatEvent.
TEST_F(StatsHidlTest, reportUsbPortOverheatEvent) {
- UsbPortOverheatEvent event = {.maxTemperatureDeciC = 220,
- .plugTemperatureDeciC = 210,
+ UsbPortOverheatEvent event = {.plugTemperatureDeciC = 210,
+ .maxTemperatureDeciC = 220,
.timeToOverheat = 1,
.timeToHysteresis = 2,
.timeToInactive = 3};
diff --git a/vr/composer/1.0/Android.bp b/vr/composer/1.0/Android.bp
index dc7c2fa..e064ba5 100644
--- a/vr/composer/1.0/Android.bp
+++ b/vr/composer/1.0/Android.bp
@@ -4,7 +4,7 @@
name: "android.frameworks.vr.composer@1.0",
root: "android.frameworks",
vndk: {
- enabled: true,
+ enabled: false,
},
srcs: [
"IVrComposerClient.hal",
@@ -16,4 +16,3 @@
],
gen_java: false,
}
-
