Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove SoundTrigger public member variables

Browse Source 
Bug: 150127026
Test: boot and verify soundtrigger hotword is functional

Change-Id: I04061cdb3eba02aac0f08de96f957e2b74c70a12
This commit is contained in:
Nicholas Ambur
2020-03-24 17:09:58 -07:00
parent 571a08feec
commit 1e43767f10
15 changed files with 513 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
tests/SoundTriggerTests/src/android/hardware/soundtrigger/SoundTriggerTest.java
View File

@@ -16,7 +16,6 @@
package android.hardware.soundtrigger;
import android.hardware.soundtrigger.SoundTrigger;
import android.hardware.soundtrigger.SoundTrigger.ConfidenceLevel;
import android.hardware.soundtrigger.SoundTrigger.Keyphrase;
import android.hardware.soundtrigger.SoundTrigger.KeyphraseRecognitionEvent;
@@ -51,10 +50,10 @@ public class SoundTriggerTest extends InstrumentationTestCase {
Keyphrase unparceled = Keyphrase.CREATOR.createFromParcel(parcel);
// Verify that they are the same
assertEquals(keyphrase.id, unparceled.id);
assertNull(unparceled.users);
assertEquals(keyphrase.locale, unparceled.locale);
assertEquals(keyphrase.text, unparceled.text);
assertEquals(keyphrase.getId(), unparceled.getId());
assertNull(unparceled.getUsers());
assertEquals(keyphrase.getLocale(), unparceled.getLocale());
assertEquals(keyphrase.getText(), unparceled.getText());
}
@SmallTest
@@ -71,10 +70,10 @@ public class SoundTriggerTest extends InstrumentationTestCase {
Keyphrase unparceled = Keyphrase.CREATOR.createFromParcel(parcel);
// Verify that they are the same
assertEquals(keyphrase.id, unparceled.id);
assertTrue(Arrays.equals(keyphrase.users, unparceled.users));
assertEquals(keyphrase.locale, unparceled.locale);
assertEquals(keyphrase.text, unparceled.text);
assertEquals(keyphrase.getId(), unparceled.getId());
assertTrue(Arrays.equals(keyphrase.getUsers(), unparceled.getUsers()));
assertEquals(keyphrase.getLocale(), unparceled.getLocale());
assertEquals(keyphrase.getText(), unparceled.getText());
}
@SmallTest
@@ -91,10 +90,10 @@ public class SoundTriggerTest extends InstrumentationTestCase {
Keyphrase unparceled = Keyphrase.CREATOR.createFromParcel(parcel);
// Verify that they are the same
assertEquals(keyphrase.id, unparceled.id);
assertTrue(Arrays.equals(keyphrase.users, unparceled.users));
assertEquals(keyphrase.locale, unparceled.locale);
assertEquals(keyphrase.text, unparceled.text);
assertEquals(keyphrase.getId(), unparceled.getId());
assertTrue(Arrays.equals(keyphrase.getUsers(), unparceled.getUsers()));
assertEquals(keyphrase.getLocale(), unparceled.getLocale());
assertEquals(keyphrase.getText(), unparceled.getText());
}
@SmallTest
@@ -116,10 +115,10 @@ public class SoundTriggerTest extends InstrumentationTestCase {
KeyphraseSoundModel unparceled = KeyphraseSoundModel.CREATOR.createFromParcel(parcel);
// Verify that they are the same
assertEquals(ksm.uuid, unparceled.uuid);
assertNull(unparceled.data);
assertEquals(ksm.type, unparceled.type);
assertTrue(Arrays.equals(keyphrases, unparceled.keyphrases));
assertEquals(ksm.getUuid(), unparceled.getUuid());
assertNull(unparceled.getData());
assertEquals(ksm.getType(), unparceled.getType());
assertTrue(Arrays.equals(keyphrases, unparceled.getKeyphrases()));
}
@SmallTest
@@ -141,10 +140,10 @@ public class SoundTriggerTest extends InstrumentationTestCase {
KeyphraseSoundModel unparceled = KeyphraseSoundModel.CREATOR.createFromParcel(parcel);
// Verify that they are the same
assertEquals(ksm.uuid, unparceled.uuid);
assertEquals(ksm.type, unparceled.type);
assertTrue(Arrays.equals(ksm.keyphrases, unparceled.keyphrases));
assertTrue(Arrays.equals(ksm.data, unparceled.data));
assertEquals(ksm.getUuid(), unparceled.getUuid());
assertEquals(ksm.getType(), unparceled.getType());
assertTrue(Arrays.equals(ksm.getKeyphrases(), unparceled.getKeyphrases()));
assertTrue(Arrays.equals(ksm.getData(), unparceled.getData()));
}
@SmallTest
@@ -163,10 +162,10 @@ public class SoundTriggerTest extends InstrumentationTestCase {
KeyphraseSoundModel unparceled = KeyphraseSoundModel.CREATOR.createFromParcel(parcel);
// Verify that they are the same
assertEquals(ksm.uuid, unparceled.uuid);
assertEquals(ksm.type, unparceled.type);
assertNull(unparceled.keyphrases);
assertTrue(Arrays.equals(ksm.data, unparceled.data));
assertEquals(ksm.getUuid(), unparceled.getUuid());
assertEquals(ksm.getType(), unparceled.getType());
assertNull(unparceled.getKeyphrases());
assertTrue(Arrays.equals(ksm.getData(), unparceled.getData()));
}
@SmallTest
@@ -185,10 +184,10 @@ public class SoundTriggerTest extends InstrumentationTestCase {
KeyphraseSoundModel unparceled = KeyphraseSoundModel.CREATOR.createFromParcel(parcel);
// Verify that they are the same
assertEquals(ksm.uuid, unparceled.uuid);
assertEquals(ksm.type, unparceled.type);
assertTrue(Arrays.equals(ksm.keyphrases, unparceled.keyphrases));
assertTrue(Arrays.equals(ksm.data, unparceled.data));
assertEquals(ksm.getUuid(), unparceled.getUuid());
assertEquals(ksm.getType(), unparceled.getType());
assertTrue(Arrays.equals(ksm.getKeyphrases(), unparceled.getKeyphrases()));
assertTrue(Arrays.equals(ksm.getData(), unparceled.getData()));
}
@LargeTest
@@ -212,10 +211,10 @@ public class SoundTriggerTest extends InstrumentationTestCase {
KeyphraseSoundModel unparceled = KeyphraseSoundModel.CREATOR.createFromParcel(parcel);
// Verify that they are the same
assertEquals(ksm.uuid, unparceled.uuid);
assertEquals(ksm.type, unparceled.type);
assertTrue(Arrays.equals(ksm.data, unparceled.data));
assertTrue(Arrays.equals(ksm.keyphrases, unparceled.keyphrases));
assertEquals(ksm.getUuid(), unparceled.getUuid());
assertEquals(ksm.getType(), unparceled.getType());
assertTrue(Arrays.equals(ksm.getData(), unparceled.getData()));
assertTrue(Arrays.equals(ksm.getKeyphrases(), unparceled.getKeyphrases()));
}
@SmallTest

47
tests/SoundTriggerTests/src/android/hardware/soundtrigger/stubhal/GenericSoundModelTest.java
View File

@@ -17,7 +17,6 @@
package android.hardware.soundtrigger;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.timeout;
@@ -37,6 +36,8 @@ import android.test.suitebuilder.annotation.SmallTest;
import com.android.internal.app.ISoundTriggerService;
import org.mockito.MockitoAnnotations;
import java.io.DataOutputStream;
import java.net.InetAddress;
import java.net.Socket;
@@ -45,8 +46,6 @@ import java.util.HashSet;
import java.util.Random;
import java.util.UUID;
import org.mockito.MockitoAnnotations;
public class GenericSoundModelTest extends AndroidTestCase {
static final int MSG_DETECTION_ERROR = -1;
static final int MSG_DETECTION_RESUME = 0;
@@ -96,11 +95,11 @@ public class GenericSoundModelTest extends AndroidTestCase {
// Update sound model
soundTriggerService.updateSoundModel(model);
loadedModelUuids.add(model.uuid);
loadedModelUuids.add(model.getUuid());
// Confirm it was updated
GenericSoundModel returnedModel =
soundTriggerService.getSoundModel(new ParcelUuid(model.uuid));
soundTriggerService.getSoundModel(new ParcelUuid(model.getUuid()));
assertEquals(model, returnedModel);
}
@@ -110,15 +109,15 @@ public class GenericSoundModelTest extends AndroidTestCase {
// Update sound model
soundTriggerService.updateSoundModel(model);
loadedModelUuids.add(model.uuid);
loadedModelUuids.add(model.getUuid());
// Delete sound model
soundTriggerService.deleteSoundModel(new ParcelUuid(model.uuid));
loadedModelUuids.remove(model.uuid);
soundTriggerService.deleteSoundModel(new ParcelUuid(model.getUuid()));
loadedModelUuids.remove(model.getUuid());
// Confirm it was deleted
GenericSoundModel returnedModel =
soundTriggerService.getSoundModel(new ParcelUuid(model.uuid));
soundTriggerService.getSoundModel(new ParcelUuid(model.getUuid()));
assertEquals(null, returnedModel);
}
@@ -134,14 +133,14 @@ public class GenericSoundModelTest extends AndroidTestCase {
// Update and start sound model recognition
soundTriggerService.updateSoundModel(model);
loadedModelUuids.add(model.uuid);
int r = soundTriggerService.startRecognition(new ParcelUuid(model.uuid), spyCallback,
loadedModelUuids.add(model.getUuid());
int r = soundTriggerService.startRecognition(new ParcelUuid(model.getUuid()), spyCallback,
config);
assertEquals("Could Not Start Recognition with code: " + r,
android.hardware.soundtrigger.SoundTrigger.STATUS_OK, r);
// Stop recognition
r = soundTriggerService.stopRecognition(new ParcelUuid(model.uuid), spyCallback);
r = soundTriggerService.stopRecognition(new ParcelUuid(model.getUuid()), spyCallback);
assertEquals("Could Not Stop Recognition with code: " + r,
android.hardware.soundtrigger.SoundTrigger.STATUS_OK, r);
}
@@ -158,13 +157,13 @@ public class GenericSoundModelTest extends AndroidTestCase {
// Update and start sound model
soundTriggerService.updateSoundModel(model);
loadedModelUuids.add(model.uuid);
soundTriggerService.startRecognition(new ParcelUuid(model.uuid), spyCallback, config);
loadedModelUuids.add(model.getUuid());
soundTriggerService.startRecognition(new ParcelUuid(model.getUuid()), spyCallback, config);
// Send trigger to stub HAL
Socket socket = new Socket(InetAddress.getLocalHost(), 14035);
DataOutputStream out = new DataOutputStream(socket.getOutputStream());
out.writeBytes("trig " + model.uuid.toString() + "\r\n");
out.writeBytes("trig " + model.getUuid().toString() + "\r\n");
out.flush();
socket.close();
@@ -227,11 +226,12 @@ public class GenericSoundModelTest extends AndroidTestCase {
if (operation == 0 && modelInfo.status == STATUS_UNLOADED) {
// Update and start sound model
soundTriggerService.updateSoundModel(modelInfo.model);
loadedModelUuids.add(modelInfo.model.uuid);
loadedModelUuids.add(modelInfo.model.getUuid());
modelInfo.status = STATUS_LOADED;
} else if (operation == 1 && modelInfo.status == STATUS_LOADED) {
// Start the sound model
int r = soundTriggerService.startRecognition(new ParcelUuid(modelInfo.model.uuid),
int r = soundTriggerService.startRecognition(new ParcelUuid(
modelInfo.model.getUuid()),
spyCallback, config);
assertEquals("Could Not Start Recognition with code: " + r,
android.hardware.soundtrigger.SoundTrigger.STATUS_OK, r);
@@ -240,7 +240,7 @@ public class GenericSoundModelTest extends AndroidTestCase {
// Send trigger to stub HAL
Socket socket = new Socket(InetAddress.getLocalHost(), 14035);
DataOutputStream out = new DataOutputStream(socket.getOutputStream());
out.writeBytes("trig " + modelInfo.model.uuid + "\r\n");
out.writeBytes("trig " + modelInfo.model.getUuid() + "\r\n");
out.flush();
socket.close();
@@ -249,19 +249,20 @@ public class GenericSoundModelTest extends AndroidTestCase {
reset(spyCallback);
} else if (operation == 3 && modelInfo.status == STATUS_STARTED) {
// Stop recognition
int r = soundTriggerService.stopRecognition(new ParcelUuid(modelInfo.model.uuid),
int r = soundTriggerService.stopRecognition(new ParcelUuid(
modelInfo.model.getUuid()),
spyCallback);
assertEquals("Could Not Stop Recognition with code: " + r,
android.hardware.soundtrigger.SoundTrigger.STATUS_OK, r);
modelInfo.status = STATUS_LOADED;
} else if (operation == 4 && modelInfo.status != STATUS_UNLOADED) {
// Delete sound model
soundTriggerService.deleteSoundModel(new ParcelUuid(modelInfo.model.uuid));
loadedModelUuids.remove(modelInfo.model.uuid);
soundTriggerService.deleteSoundModel(new ParcelUuid(modelInfo.model.getUuid()));
loadedModelUuids.remove(modelInfo.model.getUuid());
// Confirm it was deleted
GenericSoundModel returnedModel =
soundTriggerService.getSoundModel(new ParcelUuid(modelInfo.model.uuid));
GenericSoundModel returnedModel = soundTriggerService.getSoundModel(
new ParcelUuid(modelInfo.model.getUuid()));
assertEquals(null, returnedModel);
modelInfo.status = STATUS_UNLOADED;
}