diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-28 19:57:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-28 19:57:40 +0000 |
| commit | 108f5493edb50201d3dd2ba32a19db93edad8800 (patch) | |
| tree | 8da92cb26b15d10b38427056f69912c521e2791f /core/java/android/app/Activity.java | |
| parent | 359f1e91e5715644b0da4f01e58c994a9e4598aa (diff) | |
| parent | 3551a59b277fd4dc924f48116c153a50fb0913eb (diff) | |
| download | frameworks_base-108f5493edb50201d3dd2ba32a19db93edad8800.zip frameworks_base-108f5493edb50201d3dd2ba32a19db93edad8800.tar.gz frameworks_base-108f5493edb50201d3dd2ba32a19db93edad8800.tar.bz2 | |
am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '3551a59b277fd4dc924f48116c153a50fb0913eb':
Work on issue #21516866: Implement voice interaction in ResolverActivity
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 && |