summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/Activity.java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android/app/Activity.java')
-rw-r--r--core/java/android/app/Activity.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index e49acfa..bdea608 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -1864,7 +1864,10 @@ public class Activity extends ContextThemeWrapper
nci.children = children;
nci.fragments = fragments;
nci.loaders = loaders;
- nci.voiceInteractor = mVoiceInteractor;
+ if (mVoiceInteractor != null) {
+ mVoiceInteractor.retainInstance();
+ nci.voiceInteractor = mVoiceInteractor;
+ }
return nci;
}
@@ -5547,6 +5550,9 @@ public class Activity extends ContextThemeWrapper
mFragments.dumpLoaders(innerPrefix, fd, writer, args);
mFragments.getFragmentManager().dump(innerPrefix, fd, writer, args);
+ if (mVoiceInteractor != null) {
+ mVoiceInteractor.dump(innerPrefix, fd, writer, args);
+ }
if (getWindow() != null &&
getWindow().peekDecorView() != null &&