Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joanne Chung
2023-02-09 01:57:36 +00:00
committed by Android (Google) Code Review
parent 577c9de7be 5fa2cfa92b
commit 8b537cabc4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -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);

6
core/java/android/service/voice/VoiceInteractionSession.java
View File

@@ -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) {
}
/**