Skip to content

Commit 0287c45

Browse files
ericsum26gstepniewski-google
authored andcommitted
Fix NPE in TwaLauncher when fallbackStrategy is null.
There were 2 issues: * launch(Uri url) uses a null fallbackStrategy. In the fallsBackToCustomTab and fallsBackToCustomTab_whenSessionCreationFails test cases, the custom tab fallbackStrategy is supposed to be used, but it's null. * The TestCustomTabsService is supposed to support the CustomTabsService action.
1 parent de7264c commit 0287c45

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

androidbrowserhelper/src/androidTest/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<service android:name="com.google.androidbrowserhelper.trusted.testcomponents.TestCustomTabsService"
5858
android:enabled="false" android:exported="true">
5959
<intent-filter>
60-
<category android:name="androidx.browser.trusted.category.TrustedWebActivities" />
60+
<action android:name="android.support.customtabs.action.CustomTabsService" />
6161
</intent-filter>
6262
</service>
6363

androidbrowserhelper/src/androidTest/java/com/google/androidbrowserhelper/trusted/TwaLauncherTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ public void fallsBackToCustomTab() {
132132
mEnableComponents.manuallyDisable(TestCustomTabsServiceSupportsTwas.class);
133133
TwaLauncher launcher = new TwaLauncher(mActivity);
134134

135-
Runnable launchRunnable = () -> launcher.launch(URL);
135+
Runnable launchRunnable = () -> launcher.launch(new TrustedWebActivityIntentBuilder(URL),
136+
mCustomTabsCallback, null, null, TwaLauncher.CCT_FALLBACK_STRATEGY);
136137
Intent intent = getBrowserActivityWhenLaunched(launchRunnable).getIntent();
137138

138139
launcher.destroy();
@@ -143,7 +144,8 @@ public void fallsBackToCustomTab() {
143144
public void fallsBackToCustomTab_whenSessionCreationFails() {
144145
TestCustomTabsService.setCanCreateSessions(false);
145146

146-
Runnable launchRunnable = () -> mTwaLauncher.launch(URL);
147+
Runnable launchRunnable = () -> mTwaLauncher.launch(new TrustedWebActivityIntentBuilder(URL),
148+
mCustomTabsCallback, null, null, TwaLauncher.CCT_FALLBACK_STRATEGY);
147149
TestBrowser browser = getBrowserActivityWhenLaunched(launchRunnable);
148150
assertFalse(browser.getIntent().getBooleanExtra(EXTRA_LAUNCH_AS_TRUSTED_WEB_ACTIVITY,
149151
false));

0 commit comments

Comments
 (0)