Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: chrome/android/shell/java/AndroidManifest.xml.jinja2

Issue 1125143003: bluetooth: Enable Android Bluetooth permissions in chrome_shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bta-factory-enabled-
Patch Set: Remove channel predicate from Bluetooth permission Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 2
3 <!-- Copyright 2014 The Chromium Authors. All rights reserved. 3 <!-- Copyright 2014 The Chromium Authors. All rights reserved.
4 4
5 Use of this source code is governed by a BSD-style license that can be 5 Use of this source code is governed by a BSD-style license that can be
6 found in the LICENSE file. 6 found in the LICENSE file.
7 --> 7 -->
8 8
9 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 9 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
10 package="org.chromium.chrome.shell"> 10 package="org.chromium.chrome.shell">
11 11
12 <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" /> 12 <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" />
13 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> 13 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
14 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> 14 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
15 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> 15 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
16 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> 16 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
17 <uses-permission android:name="android.permission.BLUETOOTH"/>
18 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
17 <uses-permission android:name="android.permission.CAMERA" /> 19 <uses-permission android:name="android.permission.CAMERA" />
18 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> 20 <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
19 <uses-permission android:name="android.permission.INTERNET"/> 21 <uses-permission android:name="android.permission.INTERNET"/>
20 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> 22 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
21 <uses-permission android:name="android.permission.NFC"/> 23 <uses-permission android:name="android.permission.NFC"/>
22 <uses-permission android:name="android.permission.RECORD_AUDIO"/> 24 <uses-permission android:name="android.permission.RECORD_AUDIO"/>
23 <uses-permission android:name="android.permission.VIBRATE"/> 25 <uses-permission android:name="android.permission.VIBRATE"/>
24 <uses-permission android:name="android.permission.WAKE_LOCK"/> 26 <uses-permission android:name="android.permission.WAKE_LOCK"/>
25 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/> 27 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
26 <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> 28 <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 <!-- Media route controllers to use for remote playback (cast). 226 <!-- Media route controllers to use for remote playback (cast).
225 This is here, rather than in code, since it varies between upstream and downstream, 227 This is here, rather than in code, since it varies between upstream and downstream,
226 yet we need this list of classes in the notification service, which belongs upstream 228 yet we need this list of classes in the notification service, which belongs upstream
227 and doesn't run the downstream Clank startup code. The Cast code wi ll, for each media element, 229 and doesn't run the downstream Clank startup code. The Cast code wi ll, for each media element,
228 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 230 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
229 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones --> 231 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones -->
230 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 232 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
231 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 233 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
232 </application> 234 </application>
233 </manifest> 235 </manifest>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698