Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS. (4244ce6a) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −15

Original line number	Original line	Diff line number	Diff line
	@@ -323,21 +323,6 @@ public final class Settings {
	public static final String ACTION_BLUETOOTH_SETTINGS =		public static final String ACTION_BLUETOOTH_SETTINGS =
	"android.settings.BLUETOOTH_SETTINGS";		"android.settings.BLUETOOTH_SETTINGS";

	/**
	* Activity Action: Show settings to allow configuration of Wifi Displays.
	* <p>
	* In some cases, a matching Activity may not exist, so ensure you
	* safeguard against this.
	* <p>
	* Input: Nothing.
	* <p>
	* Output: Nothing.
	* @hide
	*/
	@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
	public static final String ACTION_WIFI_DISPLAY_SETTINGS =
	"android.settings.WIFI_DISPLAY_SETTINGS";

	/**		/**
	* Activity Action: Show settings to allow configuration of cast endpoints.		* Activity Action: Show settings to allow configuration of cast endpoints.
	* <p>		* <p>

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -287,7 +287,7 @@ public abstract class RemoteDisplayProvider {
	*/		*/
	public PendingIntent getSettingsPendingIntent() {		public PendingIntent getSettingsPendingIntent() {
	if (mSettingsPendingIntent == null) {		if (mSettingsPendingIntent == null) {
	Intent settingsIntent = new Intent(Settings.ACTION_WIFI_DISPLAY_SETTINGS);		Intent settingsIntent = new Intent(Settings.ACTION_CAST_SETTINGS);
	settingsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK		settingsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
	\| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED		\| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
	\| Intent.FLAG_ACTIVITY_CLEAR_TOP);		\| Intent.FLAG_ACTIVITY_CLEAR_TOP);