diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-04 01:07:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-04 01:07:36 +0000 |
| commit | f426126a76745451893b8b9e131dea61e6fb9e63 (patch) | |
| tree | 0acb8a7a4a6630c1d77efac1969e5640cb3bd7f9 | |
| parent | 6e64e22ec72ac3adfb530f57925e1d4fe1c332dc (diff) | |
| parent | 2dbeb423a91e63e7ccdb67b11d35a841bd8b8bab (diff) | |
| download | packages_apps_Settings-f426126a76745451893b8b9e131dea61e6fb9e63.zip packages_apps_Settings-f426126a76745451893b8b9e131dea61e6fb9e63.tar.gz packages_apps_Settings-f426126a76745451893b8b9e131dea61e6fb9e63.tar.bz2 | |
Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
| -rw-r--r-- | src/com/android/settings/utils/VoiceSettingsActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/utils/VoiceSettingsActivity.java b/src/com/android/settings/utils/VoiceSettingsActivity.java index 4477e92..d8a00c7 100644 --- a/src/com/android/settings/utils/VoiceSettingsActivity.java +++ b/src/com/android/settings/utils/VoiceSettingsActivity.java @@ -41,7 +41,7 @@ abstract public class VoiceSettingsActivity extends Activity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (isVoiceInteraction() || savedInstanceState == null) { + if (isVoiceInteractionRoot()) { // Only permit if this is a voice interaction. if (onVoiceSettingInteraction(getIntent())) { // If it's complete, finish. @@ -60,7 +60,7 @@ abstract public class VoiceSettingsActivity extends Activity { abstract protected boolean onVoiceSettingInteraction(Intent intent); /** - * Send a notification that the interaction was successful. If {@link prompt} is + * Send a notification that the interaction was successful. If {@param prompt} is * not null, then it will be read to the user. */ protected void notifySuccess(CharSequence prompt) { |