commit be8dc039d3aa9c321f6e204f564773b4a02ab003
author Liana Kazanova <lkazanova@google.com> Mon May 15 17:36:05 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 15 17:36:05 2023 +0000
tree 83888ef2d07e9fa86043c969b5e712ec8119a038
parent c942d1e96317bfab10d3862325d276afcf2dd74f

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

services/core/java/com/android/server/policy/AppOpsPolicy.java

diff --git a/services/core/java/com/android/server/policy/AppOpsPolicy.java b/services/core/java/com/android/server/policy/AppOpsPolicy.java
index 2cbe8db..7a5664f 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.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 @@
     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 @@
 
     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