From be8dc039d3aa9c321f6e204f564773b4a02ab003 Mon Sep 17 00:00:00 2001 From: Liana Kazanova Date: Mon, 15 May 2023 17:36:05 +0000 Subject: [PATCH] Revert "[hotword] make service exemption configurable via sysprop" Revert submission 23212396-hotword_exemption_sysprop Reason for revert: Potential culprit for b/282730720 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Reverted changes: /q/submissionid:23212396-hotword_exemption_sysprop Change-Id: I75b6f44f39db54234f47f7b63dfdc5d5e0cde1e2 --- .../java/com/android/server/policy/AppOpsPolicy.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/services/core/java/com/android/server/policy/AppOpsPolicy.java b/services/core/java/com/android/server/policy/AppOpsPolicy.java index 2cbe8db19fd22..7a5664f8135e6 100644 --- a/services/core/java/com/android/server/policy/AppOpsPolicy.java +++ b/services/core/java/com/android/server/policy/AppOpsPolicy.java @@ -37,7 +37,6 @@ import android.os.Bundle; 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; @@ -69,8 +68,6 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat 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(); @@ -204,11 +201,8 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat 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