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

Commit ec996be2 authored by Yorke Lee's avatar Yorke Lee
Browse files

Simplify DefaultDialerManager

The previous code worked with ComponentNames because it was
based off existing code for the default SMS application.
We only really need the package name however, so simplify the
code by storing and retrieving the package name directly.

Bug: 20304458
Change-Id: Icabd3a9f0f8166c105360494b601160d13767fad
parent c5184ff1
Loading
Loading
Loading
Loading
+5 −10
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@

package com.android.settings.applications;

import android.content.ComponentName;
import android.content.Context;
import android.os.UserManager;
import android.telecom.DefaultDialerManager;
@@ -49,22 +48,18 @@ public class DefaultDialerPreference extends AppListPreference {
    }

    private void loadDialerApps() {
        List<ComponentName> dialerComponents =
        List<String> dialerPackages =
                DefaultDialerManager.getInstalledDialerApplications(getContext());

        final String[] dialers = new String[dialerComponents.size()];
        for (int i = 0; i < dialerComponents.size(); i++) {
            dialers[i] = dialerComponents.get(i).getPackageName();
        final String[] dialers = new String[dialerPackages.size()];
        for (int i = 0; i < dialerPackages.size(); i++) {
            dialers[i] = dialerPackages.get(i);
        }
        setPackageNames(dialers, getDefaultPackage());
    }

    private String getDefaultPackage() {
        ComponentName appName = DefaultDialerManager.getDefaultDialerApplication(getContext());
        if (appName != null) {
            return appName.getPackageName();
        }
        return null;
        return DefaultDialerManager.getDefaultDialerApplication(getContext());
    }

    public static boolean isAvailable(Context context) {