Merge "Revert "[hotword] make service exemption configurable via sysprop"" into udc-dev

import android.os.IBinder;

import android.os.PackageTagsList;

import android.os.Process;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.service.voice.VoiceInteractionManagerInternal;

import android.service.voice.VoiceInteractionManagerInternal.HotwordDetectionServiceIdentity;

    private static final String ACTIVITY_RECOGNITION_TAGS =

            "android:activity_recognition_allow_listed_tags";

    private static final String ACTIVITY_RECOGNITION_TAGS_SEPARATOR = ";";

    private static final boolean SYSPROP_HOTWORD_DETECTION_SERVICE_REQUIRED =

            SystemProperties.getBoolean("ro.hotword.detection_service_required", false);

    @NonNull

    private final Object mLock = new Object();

    private static boolean isHotwordDetectionServiceRequired(PackageManager pm) {

        // The HotwordDetectionService APIs aren't ready yet for Auto or TV.

        if (pm.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)

                || pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {

            return false;

        }

        return SYSPROP_HOTWORD_DETECTION_SERVICE_REQUIRED;

        return !(pm.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)

                || pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK));

    }

    @Override