diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-17 23:07:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 23:07:19 +0000 |
| commit | c8457784df15e6c4361bce65628c56b9326977cf (patch) | |
| tree | 06ef32eba63da88aa480e4230cbc87dab88caeb4 /core/java | |
| parent | 825cdf8305ca950a1f9da774728252ca3b702ef6 (diff) | |
| parent | 9b7c2ee7d805e632d215a0fd7f4696b36bd510a7 (diff) | |
am 9b7c2ee7: am 35534fb4: am fb03aa36: am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev
* commit '9b7c2ee7d805e632d215a0fd7f4696b36bd510a7':
Work on issue #22556778: Starting under voice control not allowed
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/app/ResolverActivity.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index ba1913197b59..1bf17e6843ba 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -19,14 +19,11 @@ package com.android.internal.app; import android.annotation.Nullable; import android.app.Activity; import android.app.ActivityThread; -import android.app.VoiceInteractor; import android.app.VoiceInteractor.PickOptionRequest; import android.app.VoiceInteractor.PickOptionRequest.Option; import android.app.VoiceInteractor.Prompt; -import android.app.VoiceInteractor.Request; import android.os.AsyncTask; import android.provider.Settings; -import android.service.chooser.ChooserTarget; import android.text.TextUtils; import android.util.Slog; import android.widget.AbsListView; |