diff --git a/res/values/strings.xml b/res/values/strings.xml index 7907df01497..6baea65c133 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7181,8 +7181,6 @@ - - diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java index e791df83a29..30d5ad08da4 100644 --- a/src/com/android/settings/wifi/WifiSettings2.java +++ b/src/com/android/settings/wifi/WifiSettings2.java @@ -770,9 +770,9 @@ public class WifiSettings2 extends RestrictedSettingsFragment pref.setOrder(index++); pref.refresh(); - if (wifiEntry.canManageSubscription()) { + if (wifiEntry.getHelpUriString() != null) { pref.setOnButtonClickListener(preference -> { - openSubscriptionHelpPage(); + openSubscriptionHelpPage(wifiEntry); }); } mWifiEntryPreferenceCategory.addPreference(pref); @@ -1111,8 +1111,8 @@ public class WifiSettings2 extends RestrictedSettingsFragment } @VisibleForTesting - void openSubscriptionHelpPage() { - final Intent intent = getHelpIntent(getContext()); + void openSubscriptionHelpPage(WifiEntry wifiEntry) { + final Intent intent = getHelpIntent(getContext(), wifiEntry.getHelpUriString()); if (intent != null) { try { startActivityForResult(intent, MANAGE_SUBSCRIPTION); @@ -1123,10 +1123,7 @@ public class WifiSettings2 extends RestrictedSettingsFragment } @VisibleForTesting - Intent getHelpIntent(Context context) { - return HelpUtils.getHelpIntent( - context, - context.getString(R.string.help_url_manage_wifi_subscription), - context.getClass().getName()); + Intent getHelpIntent(Context context, String helpUrlString) { + return HelpUtils.getHelpIntent(context, helpUrlString, context.getClass().getName()); } } diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java index b259cc39b4f..b2a28db8dce 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java @@ -74,6 +74,7 @@ import org.robolectric.shadows.ShadowToast; public class WifiSettings2Test { private static final int NUM_NETWORKS = 4; + private static final String FAKE_URI_STRING = "fakeuri"; @Mock private PowerManager mPowerManager; @@ -281,10 +282,12 @@ public class WifiSettings2Test { @Test public void openSubscriptionHelpPage_shouldCallStartActivityForResult() { - doReturn(new Intent()).when(mWifiSettings2).getHelpIntent(mContext); + doReturn(new Intent()).when(mWifiSettings2).getHelpIntent(mContext, FAKE_URI_STRING); doNothing().when(mWifiSettings2).startActivityForResult(any(Intent.class), anyInt()); + final WifiEntry mockWifiEntry = mock(WifiEntry.class); + when(mockWifiEntry.getHelpUriString()).thenReturn(FAKE_URI_STRING); - mWifiSettings2.openSubscriptionHelpPage(); + mWifiSettings2.openSubscriptionHelpPage(mockWifiEntry); verify(mWifiSettings2, times(1)).startActivityForResult(any(), anyInt()); }