PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't show afw default app pref if there is no candidate.

Browse Source 
Change-Id: I25f077662264406a8a4d819db7b4713be753a33b
Fix: 22564285
Test: make RunSettingsRoboTests
This commit is contained in:
Fan Zhang
2017-02-22 14:29:22 -08:00
parent c1a7723c17
commit c13b950b02
6 changed files with 73 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
View File

@@ -39,7 +39,8 @@ public class DefaultBrowserPreferenceController extends DefaultAppPreferenceCont
@Override
public boolean isAvailable() {
return true;
final List<ResolveInfo> candidates = getCandidates();
return candidates != null && !candidates.isEmpty();
}
@Override
@@ -61,16 +62,6 @@ public class DefaultBrowserPreferenceController extends DefaultAppPreferenceCont
}
}
private String getOnlyAppLabel() {
// Resolve that intent and check that the handleAllWebDataURI boolean is set
final List<ResolveInfo> list = mPackageManager.queryIntentActivitiesAsUser(BROWSE_PROBE,
PackageManager.MATCH_ALL, mUserId);
if (list != null && list.size() == 1) {
return list.get(0).loadLabel(mPackageManager.getPackageManager()).toString();
}
return null;
}
@Override
protected DefaultAppInfo getDefaultAppInfo() {
try {
@@ -81,6 +72,20 @@ public class DefaultBrowserPreferenceController extends DefaultAppPreferenceCont
}
}
private List<ResolveInfo> getCandidates() {
return mPackageManager.queryIntentActivitiesAsUser(BROWSE_PROBE, PackageManager.MATCH_ALL,
mUserId);
}
private String getOnlyAppLabel() {
// Resolve that intent and check that the handleAllWebDataURI boolean is set
final List<ResolveInfo> list = getCandidates();
if (list != null && list.size() == 1) {
return list.get(0).loadLabel(mPackageManager.getPackageManager()).toString();
}
return null;
}
/**
* Whether or not the pkg contains browser capability
*/