From 2595b4cf1645e50ae8336a9f50894e07c52d0d68 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 15 Mar 2022 23:41:35 +0000 Subject: 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 --- services/java/com/android/server/SystemServer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'services/java/com/android/server/SystemServer.java') 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(); -- cgit v1.2.3