| commit | 22a982da8f9580c46d2d38e6fa059cb332ee6f99 | [log] [tgz] |
|---|---|---|
| author | Vadim Tryshev <vadimt@google.com> | Tue Jul 30 13:10:55 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 30 13:10:55 2019 -0700 |
| tree | f252b9d306596e6e3c87603eeaabb79cce3fe86e | |
| parent | 3cff3415b22ceefe02e5c9f8b1e88aafb54b6a80 [diff] | |
| parent | 2c129d3d8492e95dd7896cfbdf72ae3462ee0689 [diff] |
Merge "Not throwing NPE when can't resolve test provider" into ub-launcher3-qt-qpr1-dev am: 2c129d3d84 Change-Id: I9fa1006c6b8ffa4a80305309ef7df4976c725c39
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) {