From 7d2795e185bc15e2451cee44df6e6ca96526b305 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 30 Jul 2019 12:33:20 -0700
Subject: [PATCH] Not throwing NPE when can't resolve test provider

Change-Id: I22fa6dc5de94ffa02e0121b4f929adffcb9c1ce9
---
 .../tapl/com/android/launcher3/tapl/LauncherInstrumentation.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index fe7401ca62..1371b21193 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -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) {