Merge "Not throwing NPE when can't resolve test provider" into ub-launcher3-qt-qpr1-dev

This commit is contained in:
Vadim Tryshev
2019-07-30 19:57:11 +00:00
committed by Android (Google) Code Review

View File

@@ -178,6 +178,7 @@ public final class LauncherInstrumentation {
PackageManager pm = getContext().getPackageManager();
ProviderInfo pi = pm.resolveContentProvider(
testProviderAuthority, MATCH_ALL | MATCH_DISABLED_COMPONENTS);
assertNotNull("Cannot find content provider for " + testProviderAuthority, pi);
ComponentName cn = new ComponentName(pi.packageName, pi.name);
if (pm.getComponentEnabledSetting(cn) != COMPONENT_ENABLED_STATE_ENABLED) {