Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c8d2e79 authored by Hai Zhang's avatar Hai Zhang
Browse files

Revert "Make getInstalledDialerApplications() require an InCallService." 

This reverts commit b73ec01a.

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

Bug: 124238689
Change-Id: Idba1af59ad39da87cf3c77c9c5e31843ce2d78d1
parent b73ec01a

telecomm/java/android/telecom/DefaultDialerManager.java

+1 −33
Original line number Diff line number Diff line
@@ -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);