summaryrefslogtreecommitdiffstats
path: root/tests/VoiceInteraction
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-05-29 17:58:53 -0700
committerDianne Hackborn <hackbod@google.com>2015-06-01 11:42:04 -0700
commit2ee5c368f844bc0f6ce55ff6d5cf3d5604cad5d8 (patch)
tree592fceaa701e4bb71162f6d4da7ccc951fe5caa5 /tests/VoiceInteraction
parent4573dddcce3f232d2eeb20bfe0e204e15a9416e9 (diff)
downloadframeworks_base-2ee5c368f844bc0f6ce55ff6d5cf3d5604cad5d8.zip
frameworks_base-2ee5c368f844bc0f6ce55ff6d5cf3d5604cad5d8.tar.gz
frameworks_base-2ee5c368f844bc0f6ce55ff6d5cf3d5604cad5d8.tar.bz2
Update VoiceInteractionService from API review.
This may even manage to retain compatibility with existing binaries! (For now.) Change-Id: I3b1386287a6b9b20b57ac2e2444fd6f458837277
Diffstat (limited to 'tests/VoiceInteraction')
-rw-r--r--tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java3
-rw-r--r--tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionSession.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java
index 15196b4..578e356 100644
--- a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java
+++ b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java
@@ -23,6 +23,7 @@ import android.service.voice.AlwaysOnHotwordDetector;
import android.service.voice.AlwaysOnHotwordDetector.Callback;
import android.service.voice.AlwaysOnHotwordDetector.EventPayload;
import android.service.voice.VoiceInteractionService;
+import android.service.voice.VoiceInteractionSession;
import android.util.Log;
import java.util.Arrays;
@@ -79,7 +80,7 @@ public class MainInteractionService extends VoiceInteractionService {
Bundle args = new Bundle();
args.putParcelable("intent", new Intent(this, TestInteractionActivity.class));
args.putBundle("assist", intent.getExtras());
- startSession(args, START_WITH_ASSIST|START_WITH_SCREENSHOT);
+ startSession(args, VoiceInteractionSession.SHOW_WITH_ASSIST | VoiceInteractionSession.SHOW_WITH_SCREENSHOT);
} else {
Log.w(TAG, "Not starting -- not current voice interaction service");
}
diff --git a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionSession.java b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionSession.java
index 70a6336..f66a9ce 100644
--- a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionSession.java
+++ b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionSession.java
@@ -69,7 +69,7 @@ public class MainInteractionSession extends VoiceInteractionSession
@Override
public void onCreate(Bundle args, int startFlags) {
- super.onCreate(args);
+ super.onCreate(args, startFlags);
ActivityManager am = getContext().getSystemService(ActivityManager.class);
am.setWatchHeapLimit(40*1024*1024);
}