diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-28 19:52:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-28 19:52:53 +0000 |
| commit | 3551a59b277fd4dc924f48116c153a50fb0913eb (patch) | |
| tree | b11c52818f7c6489071ce12d2d6f5ac069ba91cf /core/java/android/app/Activity.java | |
| parent | 850dd6907f87782474d4bc128c8c0137a9cc85fc (diff) | |
| parent | 57dd737443a174379eb638450e4888500d8e4a23 (diff) | |
| download | frameworks_base-3551a59b277fd4dc924f48116c153a50fb0913eb.zip frameworks_base-3551a59b277fd4dc924f48116c153a50fb0913eb.tar.gz frameworks_base-3551a59b277fd4dc924f48116c153a50fb0913eb.tar.bz2 | |
Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev
Diffstat (limited to 'core/java/android/app/Activity.java')
| -rw-r--r-- | core/java/android/app/Activity.java | 8 |
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 && |