Merge "[Settings] Update the title if launch the fragment from search app" (b995e6d0) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/MobileNetworkIntentConverter.java

+22 −20

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ public class MobileNetworkIntentConverter implements Function<Intent, Intent> {
		private static final ComponentName sTargetComponent = ComponentName
		.createRelative("com.android.settings",
		MobileNetworkActivity.class.getTypeName());

		private static final String INTENT_TRAMPOLINE = "android.settings.SEARCH_RESULT_TRAMPOLINE";
		/**
		* These actions has better aligned with definitions within AndroidManifest.xml
		*/
		@@ -63,7 +63,8 @@ public class MobileNetworkIntentConverter implements Function<Intent, Intent> {
		android.provider.Settings.ACTION_NETWORK_OPERATOR_SETTINGS,
		android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS,
		android.provider.Settings.ACTION_MMS_MESSAGE_SETTING,
		ImsRcsManager.ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN
		ImsRcsManager.ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN,
		INTENT_TRAMPOLINE
		};

		private static final String RE_ROUTE_TAG = ":reroute:" + TAG;
		@@ -112,7 +113,8 @@ public class MobileNetworkIntentConverter implements Function<Intent, Intent> {
		if (TextUtils.equals(action,
		android.provider.Settings.ACTION_NETWORK_OPERATOR_SETTINGS)
		\|\| TextUtils.equals(action,
		android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS)) {
		android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS)
		\|\| TextUtils.equals(action, INTENT_TRAMPOLINE)) {
		// Accepted.
		ops = ops.andThen(intent -> extractArguments(intent, subId))
		.andThen(args -> rePackIntent(args, reqIntent))