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

Revert "Make getInstalledDialerApplications() require an InCallService."

Browse Source 
This reverts commit b73ec01a17.

Reason for revert: Dialer actually don't require an InCallService.

Bug: 124238689
Change-Id: Idba1af59ad39da87cf3c77c9c5e31843ce2d78d1
This commit is contained in:
Hai Zhang
2019-02-11 19:07:30 +00:00
parent b73ec01a17
commit 7c8d2e79a7
1 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
telecomm/java/android/telecom/DefaultDialerManager.java
View File

@@ -22,7 +22,6 @@ import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Binder;
@@ -163,9 +162,7 @@ public class DefaultDialerManager {
final Intent dialIntentWithTelScheme = new Intent(Intent.ACTION_DIAL);
dialIntentWithTelScheme.setData(Uri.fromParts(PhoneAccount.SCHEME_TEL, "", null));
packageNames = filterByIntent(context, packageNames, dialIntentWithTelScheme, userId);
packageNames = requireInCallService(packageNames, userId, context);
return packageNames;
return filterByIntent(context, packageNames, dialIntentWithTelScheme, userId);
}
public static List<String> getInstalledDialerApplications(Context context) {
@@ -223,35 +220,6 @@ public class DefaultDialerManager {
return result;
}
private static List<String> requireInCallService(List<String> packageNames, int userId,
Context context) {
if (packageNames == null || packageNames.isEmpty()) {
return new ArrayList<>();
}
final Intent intent = new Intent(InCallService.SERVICE_INTERFACE);
final List<ResolveInfo> resolveInfoList = context.getPackageManager()
.queryIntentServicesAsUser(intent, PackageManager.GET_META_DATA, userId);
final List<String> result = new ArrayList<>();
final int length = resolveInfoList.size();
for (int i = 0; i < length; i++) {
final ServiceInfo info = resolveInfoList.get(i).serviceInfo;
if (info == null || info.metaData == null) {
continue;
}
if (!info.metaData.getBoolean(TelecomManager.METADATA_IN_CALL_SERVICE_UI)) {
continue;
}
if (info.metaData.getBoolean(TelecomManager.METADATA_IN_CALL_SERVICE_CAR_MODE_UI)) {
continue;
}
if (packageNames.contains(info.packageName) && !result.contains(info.packageName)) {
result.add(info.packageName);
}
}
return result;
}
private static TelecomManager getTelecomManager(Context context) {
return (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);