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
This commit is contained in:
Yorke Lee
2015-04-28 11:35:22 -07:00
parent c5184ff1af
commit ec996be27b

View File

@@ -16,7 +16,6 @@
package com.android.settings.applications; package com.android.settings.applications;
import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.os.UserManager; import android.os.UserManager;
import android.telecom.DefaultDialerManager; import android.telecom.DefaultDialerManager;
@@ -49,22 +48,18 @@ public class DefaultDialerPreference extends AppListPreference {
} }
private void loadDialerApps() { private void loadDialerApps() {
List<ComponentName> dialerComponents = List<String> dialerPackages =
DefaultDialerManager.getInstalledDialerApplications(getContext()); DefaultDialerManager.getInstalledDialerApplications(getContext());
final String[] dialers = new String[dialerComponents.size()]; final String[] dialers = new String[dialerPackages.size()];
for (int i = 0; i < dialerComponents.size(); i++) { for (int i = 0; i < dialerPackages.size(); i++) {
dialers[i] = dialerComponents.get(i).getPackageName(); dialers[i] = dialerPackages.get(i);
} }
setPackageNames(dialers, getDefaultPackage()); setPackageNames(dialers, getDefaultPackage());
} }
private String getDefaultPackage() { private String getDefaultPackage() {
ComponentName appName = DefaultDialerManager.getDefaultDialerApplication(getContext()); return DefaultDialerManager.getDefaultDialerApplication(getContext());
if (appName != null) {
return appName.getPackageName();
}
return null;
} }
public static boolean isAvailable(Context context) { public static boolean isAvailable(Context context) {