summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/SystemServer.java
diff options
context:
space:
mode:
authorHui Wang <huiwang@google.com>2022-03-15 23:41:35 +0000
committerHui Wang <huiwang@google.com>2022-03-16 16:11:26 +0000
commit2595b4cf1645e50ae8336a9f50894e07c52d0d68 (patch)
tree69e682608f5349a4e69fceceea940fb6b2b3cc63 /services/java/com/android/server/SystemServer.java
parentbce590e3562105618aecead911987f7176f4aa4d (diff)
Start TelecomLoaderService based on FEATURE_TELECOM
TelecomLoaderService should be configured by FEATURE_TELECOM. We also keep checking FEATURE_TELEPHONY for backward compatible, which will be phased out in the future. Bug: 221098783 Test: build Change-Id: I0bee21402e1dc6baa485205290d674336c8283ae
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
-rw-r--r--services/java/com/android/server/SystemServer.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index f7c66c5cff69..73f0a74c232e 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1486,8 +1486,9 @@ public final class SystemServer implements Dumpable {
// TelecomLoader hooks into classes with defined HFP logic,
// so check for either telephony or microphone.
- if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_MICROPHONE) ||
- mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+ if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_MICROPHONE)
+ || mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELECOM)
+ || mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
t.traceBegin("StartTelecomLoaderService");
mSystemServiceManager.startService(TelecomLoaderService.class);
t.traceEnd();