Correctly report whether the current app is default home.

Change-Id: I79c374228e82c91667d7b5a0dcc19fa1216e57c4
Fix: 38065524
Test: make RunSettingsRoboTests
This commit is contained in:
Fan Zhang
2017-05-12 17:04:14 -07:00
parent 5230ffe3a5
commit 8e0754e84c
3 changed files with 39 additions and 7 deletions

View File

@@ -26,6 +26,8 @@ import android.content.pm.ResolveInfo;
import android.support.v7.preference.Preference;
import android.text.TextUtils;
import com.android.settings.applications.PackageManagerWrapper;
import java.util.ArrayList;
import java.util.List;
@@ -106,11 +108,10 @@ public class DefaultHomePreferenceController extends DefaultAppPreferenceControl
return false;
}
public static boolean isHomeDefault(String pkg, Context context) {
ArrayList<ResolveInfo> homeActivities = new ArrayList<>();
PackageManager pm = context.getPackageManager();
public static boolean isHomeDefault(String pkg, PackageManagerWrapper pm) {
final ArrayList<ResolveInfo> homeActivities = new ArrayList<>();
ComponentName def = pm.getHomeActivities(homeActivities);
return def != null && def.getPackageName().equals(pkg);
return def == null || def.getPackageName().equals(pkg);
}
}