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

Commit 6b2e02d8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add some java doc in the VoiceInteractionSession" into sc-v2-dev am:... 

Merge "Add some java doc in the VoiceInteractionSession" into sc-v2-dev am: 8cb200a2 am: 723f9d22

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16426617

Change-Id: I237cd5db76c0d497374e21b23800b96f70fc405d
parents 8029969f 723f9d22

core/java/android/service/voice/VoiceInteractionSession.java

+7 −4
Original line number Diff line number Diff line
@@ -1749,8 +1749,9 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall 
    /**

     * Called when there has been a failure transferring the {@link AssistStructure} to

     * the assistant.  This may happen, for example, if the data is too large and results

     * in an out of memory exception, or the client has provided corrupt data.  This will

     * be called immediately before {@link #onHandleAssist} and the AssistStructure supplied

     * in an out of memory exception, the data has been cleared during transferring due to

     * the new incoming assist data, or the client has provided corrupt data. This will be

     * called immediately before {@link #onHandleAssist} and the AssistStructure supplied

     * there afterwards will be null.

     *

     * @param failure The failure exception that was thrown when building the
@@ -1788,7 +1789,8 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall 
     * Called to receive data from the application that the user was currently viewing when

     * an assist session is started. If the original show request did not specify

     * {@link #SHOW_WITH_ASSIST}, {@link AssistState} parameter will only provide

     * {@link ActivityId}.

     * {@link ActivityId}. If there was a failure to write the assist data to

     * {@link AssistStructure}, the {@link AssistState#getAssistStructure()} will return null.

     *

     * <p>This method is called for all activities along with an index and count that indicates

     * which activity the data is for. {@code index} will be between 0 and {@code count}-1 and
@@ -2213,7 +2215,8 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall 
         * @return If available, the structure definition of all windows currently

         * displayed by the app. May be null if assist data has been disabled by the user

         * or device policy; will be null if the original show request did not specify

         * {@link #SHOW_WITH_ASSIST}; will be an empty stub if the application has disabled assist

         * {@link #SHOW_WITH_ASSIST} or the assist data has been corrupt when writing the data to

         * {@link AssistStructure}; will be an empty stub if the application has disabled assist

         * by marking its window as secure.

         */

        public @Nullable AssistStructure getAssistStructure() {