PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f426126a: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev

Browse Source 
* commit 'f426126a76745451893b8b9e131dea61e6fb9e63':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs
This commit is contained in:
Dianne Hackborn
2015-08-04 01:12:29 +00:00
committed by Android Git Automerger
parent bd3d49f787 f426126a76
commit e86b170d7f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/utils/VoiceSettingsActivity.java
View File

@@ -41,7 +41,7 @@ abstract public class VoiceSettingsActivity extends Activity {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (isVoiceInteraction() || savedInstanceState == null) { if (isVoiceInteractionRoot()) {
// Only permit if this is a voice interaction. // Only permit if this is a voice interaction.
if (onVoiceSettingInteraction(getIntent())) { if (onVoiceSettingInteraction(getIntent())) {
// If it's complete, finish. // If it's complete, finish.
@@ -60,7 +60,7 @@ abstract public class VoiceSettingsActivity extends Activity {
abstract protected boolean onVoiceSettingInteraction(Intent intent); 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. * not null, then it will be read to the user.
*/ */
protected void notifySuccess(CharSequence prompt) { protected void notifySuccess(CharSequence prompt) {