From b8d9c4b124f82daa48da8cf8d061b7b488d5011e Mon Sep 17 00:00:00 2001 From: Thomas Stuart Date: Tue, 25 Oct 2022 11:15:25 -0700 Subject: add configuration for UI_MODE_TYPE_CAR for BaseTelecomTestWMockServices auto builds were experiencing test failure becuase of ui mode asserts when BaseTelecomWithMockServices was setting up. This is a result of telecom not setting up the configuration for UI_MODE_TYPE_CAR. The configuration is now set Bug: 254257399 (original bug) Fixes: 337190435 (CP request from partner) Test: fix mock service (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aa02ff1341c3892dfb4b1f8b3269906c7253aec2) Merged-In: I4f78d424d4afdf2b61315ed92a13135cc09a0bbc Change-Id: I4f78d424d4afdf2b61315ed92a13135cc09a0bbc --- .../src/android/telecom/cts/BaseTelecomTestWithMockServices.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/tests/telecom/src/android/telecom/cts/BaseTelecomTestWithMockServices.java b/tests/tests/telecom/src/android/telecom/cts/BaseTelecomTestWithMockServices.java index 439b37790d9..c0ce1a50e53 100644 --- a/tests/tests/telecom/src/android/telecom/cts/BaseTelecomTestWithMockServices.java +++ b/tests/tests/telecom/src/android/telecom/cts/BaseTelecomTestWithMockServices.java @@ -276,9 +276,12 @@ public class BaseTelecomTestWithMockServices extends InstrumentationTestCase { TestUtils.executeShellCommand(getInstrumentation(), "telecom reset-car-mode"); if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) { - assertUiMode(Configuration.UI_MODE_TYPE_WATCH); + assertUiMode(Configuration.UI_MODE_TYPE_WATCH); + } else if (mContext.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_AUTOMOTIVE)) { + assertUiMode(Configuration.UI_MODE_TYPE_CAR); } else { - assertUiMode(Configuration.UI_MODE_TYPE_NORMAL); + assertUiMode(Configuration.UI_MODE_TYPE_NORMAL); } AppOpsManager aom = mContext.getSystemService(AppOpsManager.class); -- cgit v1.2.3