commit 7d2795e185bc15e2451cee44df6e6ca96526b305
author vadimt <vadimt@google.com> Tue Jul 30 12:33:20 2019 -0700
committer vadimt <vadimt@google.com> Tue Jul 30 12:33:20 2019 -0700
tree d185f4de131d76a812669238994514d180944951
parent 1767e9e537756f09a27bf28c6484546fc9b0fe8f

Not throwing NPE when can't resolve test provider

Change-Id: I22fa6dc5de94ffa02e0121b4f929adffcb9c1ce9

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

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