A couple of bug fixes in CTS tests:
1. Null pointer bug fixed in VoiceInteraction tests. This
fix is for all devices that don't support the voice intents.
2. The fix in VoiceSettings is relevant for all android
devices (even if they don't support voice intents).
BUG: 24195552
Change-Id: Ibc50220d97a0964fad9a5d8566cdc028292fa066
diff --git a/tests/tests/voiceinteraction/testapp/AndroidManifest.xml b/tests/tests/voiceinteraction/testapp/AndroidManifest.xml
index 1c9ee71..15069ec 100644
--- a/tests/tests/voiceinteraction/testapp/AndroidManifest.xml
+++ b/tests/tests/voiceinteraction/testapp/AndroidManifest.xml
@@ -23,7 +23,7 @@
<activity android:name="TestApp"
android:label="Voice Interaction Test App"
- android:theme="@android:style/Theme.Material.Light">
+ android:theme="@android:style/Theme.DeviceDefault">
<intent-filter>
<action android:name="android.intent.action.TEST_APP" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/tests/tests/voicesettings/src/android/voicesettings/cts/AirplaneModeTest.java b/tests/tests/voicesettings/src/android/voicesettings/cts/AirplaneModeTest.java
index 2d19162..9ce743e 100644
--- a/tests/tests/voicesettings/src/android/voicesettings/cts/AirplaneModeTest.java
+++ b/tests/tests/voicesettings/src/android/voicesettings/cts/AirplaneModeTest.java
@@ -36,6 +36,7 @@
public void testAll() throws Exception {
if (!isIntentSupported(ACTION_VOICE_CONTROL_AIRPLANE_MODE)) {
+ Log.e(TAG, "Voice intent for Airplane Mode NOT supported. existing the test");
return;
}
int mode;
diff --git a/tests/tests/voicesettings/src/android/voicesettings/cts/BatterySaverModeTest.java b/tests/tests/voicesettings/src/android/voicesettings/cts/BatterySaverModeTest.java
index 6fe82a7..983e27b 100644
--- a/tests/tests/voicesettings/src/android/voicesettings/cts/BatterySaverModeTest.java
+++ b/tests/tests/voicesettings/src/android/voicesettings/cts/BatterySaverModeTest.java
@@ -33,6 +33,7 @@
public void testAll() throws Exception {
if (!isIntentSupported(ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE)) {
+ Log.e(TAG, "Voice intent for Battery Saver Mode NOT supported. existing the test");
return;
}
startTestActivity("BATTERYSAVER_MODE");
diff --git a/tests/tests/voicesettings/src/android/voicesettings/cts/VoiceSettingsTestBase.java b/tests/tests/voicesettings/src/android/voicesettings/cts/VoiceSettingsTestBase.java
index b355e7b..98b9c29 100644
--- a/tests/tests/voicesettings/src/android/voicesettings/cts/VoiceSettingsTestBase.java
+++ b/tests/tests/voicesettings/src/android/voicesettings/cts/VoiceSettingsTestBase.java
@@ -54,7 +54,9 @@
@Override
protected void tearDown() throws Exception {
- mContext.unregisterReceiver(mActivityDoneReceiver);
+ if (mActivityDoneReceiver != null) {
+ mContext.unregisterReceiver(mActivityDoneReceiver);
+ }
super.tearDown();
}
diff --git a/tests/tests/voicesettings/src/android/voicesettings/cts/ZenModeTest.java b/tests/tests/voicesettings/src/android/voicesettings/cts/ZenModeTest.java
index b0ddf44..420da8f 100644
--- a/tests/tests/voicesettings/src/android/voicesettings/cts/ZenModeTest.java
+++ b/tests/tests/voicesettings/src/android/voicesettings/cts/ZenModeTest.java
@@ -41,6 +41,7 @@
public void testAll() throws Exception {
if (!isIntentSupported(ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE)) {
+ Log.e(TAG, "Voice intent for Zen Mode NOT supported. existing the test");
return;
}
int mode;
