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

Commit 8b537cab authored by Joanne Chung's avatar Joanne Chung Committed by Android (Google) Code Review
Browse files

Merge "Add nullability annotation for VISS#onShow()"

parents 577c9de7 5fa2cfa9

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -40981,7 +40981,7 @@ package android.service.voice { 
    method public void onRequestCompleteVoice(android.service.voice.VoiceInteractionSession.CompleteVoiceRequest);

    method public void onRequestConfirmation(android.service.voice.VoiceInteractionSession.ConfirmationRequest);

    method public void onRequestPickOption(android.service.voice.VoiceInteractionSession.PickOptionRequest);

    method public void onShow(android.os.Bundle, int);

    method public void onShow(@Nullable android.os.Bundle, int);

    method public void onTaskFinished(android.content.Intent, int);

    method public void onTaskStarted(android.content.Intent, int);

    method public void onTrimMemory(int);

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

+4 −2
Original line number Diff line number Diff line
@@ -1781,11 +1781,13 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall 
     * Intent.EXTRA_TIME ("android.intent.extra.TIME") indicating timing

     * in milliseconds of the KeyEvent that triggered Assistant and

     * Intent.EXTRA_ASSIST_INPUT_DEVICE_ID (android.intent.extra.ASSIST_INPUT_DEVICE_ID)

     *  referring to the device that sent the request.

     *  referring to the device that sent the request. Starting from Android 14, the system will

     * add {@link VoiceInteractionService#KEY_SHOW_SESSION_ID}, the Bundle is not null. But the

     * application should handle null case before Android 14.

     * @param showFlags The show flags originally provided to

     * {@link VoiceInteractionService#showSession VoiceInteractionService.showSession}.

     */

    public void onShow(Bundle args, int showFlags) {

    public void onShow(@Nullable Bundle args, int showFlags) {

    }



    /**