commit 2c129d3d8492e95dd7896cfbdf72ae3462ee0689
author Vadim Tryshev <vadimt@google.com> Tue Jul 30 19:57:11 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 30 19:57:11 2019 +0000
tree 43e7339afb0ad80ab6d9109d31b3c0271c266333
parent 6d09a7770fd1c8d1da3fe312864f083594ffd94d
parent 7d2795e185bc15e2451cee44df6e6ca96526b305

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

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) {