diff options
| author | RoboErik <epastern@google.com> | 2014-03-20 13:33:52 -0700 |
|---|---|---|
| committer | RoboErik <epastern@google.com> | 2014-04-17 15:02:33 -0700 |
| commit | 07c7077c54717dbbf2c401ea32d00fa6df6d77c6 (patch) | |
| tree | 49f9e8019caa93c702c6d2d8213767de3d1499c6 /core/res | |
| parent | 46175e152891eabd9051523f2f077de5a5562996 (diff) | |
| download | frameworks_base-07c7077c54717dbbf2c401ea32d00fa6df6d77c6.zip frameworks_base-07c7077c54717dbbf2c401ea32d00fa6df6d77c6.tar.gz frameworks_base-07c7077c54717dbbf2c401ea32d00fa6df6d77c6.tar.bz2 | |
Add RouteProviders to the new Media APIs
Compiles and works with OneMedia. This currently is a rough test of
the system for finding, connecting to, and sending messages to routes.
This will just connect to the first route it finds when a request to
open the route picker is made (and disconnect when another request is
made).
Change-Id: I5de5521a079471b9e02664be4654c0591dfd9a6d
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 606a4b1..66f947b 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2070,6 +2070,14 @@ android:description="@string/permdesc_bindTvInput" android:protectionLevel="signature|system" /> + <!-- Must be required by a {@link android.media.routeprovider.RouteProviderService} + to ensure that only the system can interact with it. + --> + <permission android:name="android.permission.BIND_ROUTE_PROVIDER" + android:label="@string/permlab_bindRouteProvider" + android:description="@string/permdesc_bindRouteProvider" + android:protectionLevel="signature" /> + <!-- Must be required by device administration receiver, to ensure that only the system can interact with it. --> <permission android:name="android.permission.BIND_DEVICE_ADMIN" diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index b0e1150..cacb41f 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1077,6 +1077,12 @@ interface of a widget service. Should never be needed for normal apps.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permlab_bindRouteProvider">bind to a route provider service</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_bindRouteProvider">Allows the holder to bind to any registered + route providers. Should never be needed for normal apps.</string> + + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_bindDeviceAdmin">interact with a device admin</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_bindDeviceAdmin">Allows the holder to send intents to |