commit c722ec4105f7a4733a22fb9004e784347ee36663
author Arunesh Mishra <arunesh@google.com> Wed Jan 27 13:29:12 2016 -0800
committer Arunesh Mishra <arunesh@google.com> Wed Jan 27 13:37:27 2016 -0800
tree 2461f5dc1a138a73ac84d41c5369362177ff379d
parent a0d65dc0db93c63e1a1dd19ca0bfff6f1fef14a9

Fix SoundTriggerModel uses to GenericSoundModel.

Change-Id: I30308b39536864d7b9640367861730e3b1b12129

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java

diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
index 10c3395..5e8fe9e 100644
--- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
+++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
@@ -21,9 +21,9 @@
 import android.Manifest;
 import android.hardware.soundtrigger.IRecognitionStatusCallback;
 import android.hardware.soundtrigger.SoundTrigger;
+import android.hardware.soundtrigger.SoundTrigger.GenericSoundModel;
 import android.hardware.soundtrigger.SoundTrigger.KeyphraseSoundModel;
 import android.hardware.soundtrigger.SoundTrigger.RecognitionConfig;
-import android.hardware.soundtrigger.SoundTrigger.SoundTriggerModel;
 import android.os.Parcel;
 import android.os.ParcelUuid;
 import android.os.RemoteException;
@@ -117,12 +117,12 @@
         }
 
         @Override
-        public SoundTrigger.SoundTriggerModel getSoundModel(ParcelUuid soundModelId) {
+        public SoundTrigger.GenericSoundModel getSoundModel(ParcelUuid soundModelId) {
             enforceCallingPermission(Manifest.permission.MANAGE_SOUND_TRIGGER);
             if (DEBUG) {
                 Slog.i(TAG, "getSoundModel(): id = " + soundModelId);
             }
-            SoundTrigger.SoundTriggerModel model = mDbHelper.getSoundTriggerModel(soundModelId.getUuid());
+            SoundTrigger.GenericSoundModel model = mDbHelper.getGenericSoundModel(soundModelId.getUuid());
             if (model == null) {
                 Slog.e(TAG, "Null model in database.");
             }
@@ -130,12 +130,12 @@
         }
 
         @Override
-        public void updateSoundModel(SoundTrigger.SoundTriggerModel soundModel) {
+        public void updateSoundModel(SoundTrigger.GenericSoundModel soundModel) {
             enforceCallingPermission(Manifest.permission.MANAGE_SOUND_TRIGGER);
             if (DEBUG) {
                 Slog.i(TAG, "updateSoundModel(): model = " + soundModel);
             }
-            mDbHelper.updateSoundTriggerModel(soundModel);
+            mDbHelper.updateGenericSoundModel(soundModel);
         }
 
         @Override
@@ -144,7 +144,7 @@
             if (DEBUG) {
                 Slog.i(TAG, "deleteSoundModel(): id = " + soundModelId);
             }
-            mDbHelper.deleteSoundTriggerModel(soundModelId.getUuid());
+            mDbHelper.deleteGenericSoundModel(soundModelId.getUuid());
         }
     }