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

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

package android.service.voice;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SdkConstant;

import android.annotation.UnsupportedAppUsage;

import android.app.Service;

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;

     *

     * @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

            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) {

            }

        }