summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorvadimt <vadimt@google.com>2019-07-30 12:33:20 -0700
committervadimt <vadimt@google.com>2019-07-30 12:33:20 -0700
commit7d2795e185bc15e2451cee44df6e6ca96526b305 (patch)
treed185f4de131d76a812669238994514d180944951 /tests
parent1767e9e537756f09a27bf28c6484546fc9b0fe8f (diff)
downloadandroid_packages_apps_Trebuchet-7d2795e185bc15e2451cee44df6e6ca96526b305.tar.gz
android_packages_apps_Trebuchet-7d2795e185bc15e2451cee44df6e6ca96526b305.tar.bz2
android_packages_apps_Trebuchet-7d2795e185bc15e2451cee44df6e6ca96526b305.zip
Not throwing NPE when can't resolve test provider
Change-Id: I22fa6dc5de94ffa02e0121b4f929adffcb9c1ce9
Diffstat (limited to 'tests')
-rw-r--r--tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index fe7401ca6..1371b2119 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) {