commit ed6a170ab0d5e0365bc494a8004ee9ac50318892
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 02 19:06:19 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 02 19:06:19 2020 +0000
tree cd1bda2edb0581974eeecc7891ea477e243e8ffa
parent 071aa856ba9dc13962e371e525d9e77696297fd0
parent f80c28407634b8232acbf6e5d49baad101a5db7f

Merge "Exclude TYPE_HEART_RATE sensor type from CtsSensorTestCases[instant]"

tests/sensor/src/android/hardware/cts/SensorTest.java

diff --git a/tests/sensor/src/android/hardware/cts/SensorTest.java b/tests/sensor/src/android/hardware/cts/SensorTest.java
index f48ed77..8b2e234 100644
--- a/tests/sensor/src/android/hardware/cts/SensorTest.java
+++ b/tests/sensor/src/android/hardware/cts/SensorTest.java
@@ -87,7 +87,8 @@
 
         mAndroidSensorList = new ArrayList<>();
         for (Sensor s : mSensorList) {
-            if (s.getType() < Sensor.TYPE_DEVICE_PRIVATE_BASE) {
+            if (s.getType() < Sensor.TYPE_DEVICE_PRIVATE_BASE &&
+                    (!context.getPackageManager().isInstantApp() || s.getType() != Sensor.TYPE_HEART_RATE)) {
                 mAndroidSensorList.add(s);
             }
         }