commit 28e5c04954813f6f016b0d6da60da5c5f6412982
author Yao, Yuxing <yaoyx@google.com> Wed Sep 25 14:23:51 2019 -0700
committer Yao, Yuxing <yaoyx@google.com> Wed Sep 25 14:28:44 2019 -0700
tree a4873b1b24db51293bdb0961e239a8bc10b1e0ef
parent aa8a5547c0305ad067e27f0133e6bdb2d33108de

Skip test on user build due to framework behavior.

Bug: 139943440
Test: $ m cts -j && cts-tradefed run cts-dev -m CtsCarTestCases
Against emulator on pi-car-dev:
$ lunch sdk_gcar_x86-user && m -j && emulator

Change-Id: I8d9295f162cc47c86bab90e0be62402cfdfd61df

tests/tests/car/src/android/car/cts/CarPackageManagerTest.java

diff --git a/tests/tests/car/src/android/car/cts/CarPackageManagerTest.java b/tests/tests/car/src/android/car/cts/CarPackageManagerTest.java
index 5f391e4..357f985 100644
--- a/tests/tests/car/src/android/car/cts/CarPackageManagerTest.java
+++ b/tests/tests/car/src/android/car/cts/CarPackageManagerTest.java
@@ -22,6 +22,7 @@
 import android.car.Car;
 import android.car.CarNotConnectedException;
 import android.car.content.pm.CarPackageManager;
+import android.os.Build;
 import android.platform.test.annotations.RequiresDevice;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ -77,6 +78,10 @@
     @Test
     public void testDistractionOptimizedActivityIsAllowed() throws CarNotConnectedException {
         // This test relies on test activity in installed apk, and AndroidManifest declaration.
+        if (Build.TYPE.equalsIgnoreCase("user")) {
+            // Skip this test on user build, which checks the install source for DO activity list.
+            return;
+        }
         assertTrue(mCarPm.isActivityDistractionOptimized("android.car.cts",
                 "android.car.cts.drivingstate.DistractionOptimizedActivity"));
     }
@@ -84,6 +89,10 @@
     @Test
     public void testNonDistractionOptimizedActivityNotAllowed() throws CarNotConnectedException {
         // This test relies on test activity in installed apk, and AndroidManifest declaration.
+        if (Build.TYPE.equalsIgnoreCase("user")) {
+            // Skip this test on user build, which checks the install source for DO activity list.
+            return;
+        }
         assertFalse(mCarPm.isActivityDistractionOptimized("android.car.cts",
                 "android.car.cts.drivingstate.NonDistractionOptimizedActivity"));
     }