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

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

Browse Source
This commit is contained in:
Liana Kazanova
2023-05-15 19:11:08 +00:00
committed by Android (Google) Code Review
parent 04f4e549db be8dc039d3
commit 11cd46966d
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/policy/AppOpsPolicy.java
View File

@@ -37,7 +37,6 @@ import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.os.PackageTagsList; import android.os.PackageTagsList;
import android.os.Process; import android.os.Process;
import android.os.SystemProperties;
import android.os.UserHandle; import android.os.UserHandle;
import android.service.voice.VoiceInteractionManagerInternal; import android.service.voice.VoiceInteractionManagerInternal;
import android.service.voice.VoiceInteractionManagerInternal.HotwordDetectionServiceIdentity; import android.service.voice.VoiceInteractionManagerInternal.HotwordDetectionServiceIdentity;
@@ -69,8 +68,6 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat
private static final String ACTIVITY_RECOGNITION_TAGS = private static final String ACTIVITY_RECOGNITION_TAGS =
"android:activity_recognition_allow_listed_tags"; "android:activity_recognition_allow_listed_tags";
private static final String ACTIVITY_RECOGNITION_TAGS_SEPARATOR = ";"; 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 @NonNull
private final Object mLock = new Object(); private final Object mLock = new Object();
@@ -204,11 +201,8 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat
private static boolean isHotwordDetectionServiceRequired(PackageManager pm) { private static boolean isHotwordDetectionServiceRequired(PackageManager pm) {
// The HotwordDetectionService APIs aren't ready yet for Auto or TV. // The HotwordDetectionService APIs aren't ready yet for Auto or TV.
if (pm.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE) return !(pm.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)
|| pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) { || pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK));
return false;
}
return SYSPROP_HOTWORD_DETECTION_SERVICE_REQUIRED;
} }
@Override @Override