diff options
| author | Jeff Brown <jeffbrown@google.com> | 2015-05-05 13:46:30 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2015-05-06 16:02:21 -0700 |
| commit | c05c1aeedf44b7019b6749758dffc03df7632225 (patch) | |
| tree | 24126136b2dcb20e4d0d64b031bb1cb4243b4a06 /core | |
| parent | c2ec334079375ac6a4337bd5b94e173534b51129 (diff) | |
| download | frameworks_base-c05c1aeedf44b7019b6749758dffc03df7632225.zip frameworks_base-c05c1aeedf44b7019b6749758dffc03df7632225.tar.gz frameworks_base-c05c1aeedf44b7019b6749758dffc03df7632225.tar.bz2 | |
Revert "Initial draft of new MediaRouter APIs."
This reverts commit 1a937b04e63539cb1fab1bde601031d415c7156f.
Bug: 20641986
Change-Id: I035d945d1561e5fc7c914aa9362635f763c83cfd
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Settings.java | 3 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 3518f83..2ca0773 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -339,8 +339,7 @@ public final class Settings { "android.settings.WIFI_DISPLAY_SETTINGS"; /** - * Activity Action: Show settings to allow configuration of - * {@link android.media.routing.MediaRouteService media route providers}. + * Activity Action: Show settings to allow configuration of cast endpoints. * <p> * In some cases, a matching Activity may not exist, so ensure you * safeguard against this. diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index e3930cd..5669b91 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2352,11 +2352,6 @@ <permission android:name="android.permission.BIND_CONDITION_PROVIDER_SERVICE" android:protectionLevel="signature" /> - <!-- Must be required by a {@link android.media.routing.MediaRouteService}, - to ensure that only the system can bind to it. --> - <permission android:name="android.permission.BIND_MEDIA_ROUTE_SERVICE" - android:protectionLevel="signature" /> - <!-- Must be required by an {@link android.service.dreams.DreamService}, to ensure that only the system can bind to it. --> <permission android:name="android.permission.BIND_DREAM_SERVICE" |