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

am: 2c129d3d84 Change-Id: I9fa1006c6b8ffa4a80305309ef7df4976c725c39
2019-07-30 13:10:55 -07:00
parent 3cff3415b2 2c129d3d84
commit 22a982da8f
1 changed files with 1 additions and 0 deletions
@@ -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) {