Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22a982da authored by Vadim Tryshev's avatar Vadim Tryshev Committed by android-build-merger
Browse files

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

am: 2c129d3d

Change-Id: I9fa1006c6b8ffa4a80305309ef7df4976c725c39
parents 3cff3415 2c129d3d
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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) {