Merge "Simplify DefaultDialerManager" into mnc-dev
This commit is contained in:
@@ -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) {
|
||||||
|
Reference in New Issue
Block a user