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