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

Merge "make onGetSupportedVoiceActions return @NonNull and return empty set by default" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-16 15:28:22 +00:00
committed by Android (Google) Code Review
parent 37f27b53a8 5422f30c14
commit b6abb2c59c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -41758,7 +41758,7 @@ package android.service.voice {
method public int getDisabledShowContext();
method public static boolean isActiveService(android.content.Context, android.content.ComponentName);
method public android.os.IBinder onBind(android.content.Intent);
method @Nullable public java.util.Set<java.lang.String> onGetSupportedVoiceActions(@NonNull java.util.Set<java.lang.String>);
method @NonNull public java.util.Set<java.lang.String> onGetSupportedVoiceActions(@NonNull java.util.Set<java.lang.String>);
method public void onLaunchVoiceAssistFromKeyguard();
method public void onReady();
method public void onShutdown();

10
core/java/android/service/voice/VoiceInteractionService.java
View File

@@ -17,7 +17,6 @@
package android.service.voice;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SdkConstant;
import android.annotation.UnsupportedAppUsage;
import android.app.Service;
@@ -41,6 +40,7 @@ import com.android.internal.util.function.pooled.PooledLambda;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Set;
@@ -211,11 +211,11 @@ public class VoiceInteractionService extends Service {
*
* @param voiceActions A set of checked voice actions.
* @return Returns a subset of checked voice actions. Additional voice actions in the
* returned set will be ignored. Returns null or empty set if no actions are supported.
* returned set will be ignored. Returns empty set if no actions are supported.
*/
@Nullable
@NonNull
public Set<String> onGetSupportedVoiceActions(@NonNull Set<String> voiceActions) {
return null;
return Collections.emptySet();
}
@Override
@@ -272,7 +272,7 @@ public class VoiceInteractionService extends Service {
try {
Set<String> voiceActionsSet = new ArraySet<>(voiceActions);
Set<String> resultSet = onGetSupportedVoiceActions(voiceActionsSet);
callback.onComplete(resultSet == null ? null : new ArrayList<>(resultSet));
callback.onComplete(new ArrayList<>(resultSet));
} catch (RemoteException e) {
}
}