Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.

Browse Source 
Bug: 20641986
Change-Id: I137dfc7ef41bdda2ce3e81c164767319c88159f1
This commit is contained in:
Jeff Brown
2015-05-05 13:52:23 -07:00
parent c05c1aeedf
commit 4244ce6a17
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/provider/Settings.java
View File

@@ -323,21 +323,6 @@ public final class Settings {
public static final String ACTION_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.
* <p>

2
media/lib/remotedisplay/java/com/android/media/remotedisplay/RemoteDisplayProvider.java
View File

@@ -287,7 +287,7 @@ public abstract class RemoteDisplayProvider {
*/
public PendingIntent getSettingsPendingIntent() {
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
| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
| Intent.FLAG_ACTIVITY_CLEAR_TOP);