Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e86b170d authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am f426126a: Merge "Fix issue #22860466: viapi security bug - rubber stamping... 

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

* commit 'f426126a':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs
parents bd3d49f7 f426126a

src/com/android/settings/utils/VoiceSettingsActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {