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

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

Issue 1226103005: Revert of bluetooth: android: Initial Low Energy Discovery Sessions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bta-manifest-
Patch Set: Created 5 years, 5 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 | device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java » ('j') | 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"/> 17 <uses-permission android:name="android.permission.BLUETOOTH"/>
18 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> 18 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
19 <uses-feature android:name="android.hardware.bluetooth_le" android:required= "false"/>
20 <uses-permission android:name="android.permission.CAMERA" /> 19 <uses-permission android:name="android.permission.CAMERA" />
21 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> 20 <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
22 <uses-permission android:name="android.permission.INTERNET"/> 21 <uses-permission android:name="android.permission.INTERNET"/>
23 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> 22 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
24 <uses-permission android:name="android.permission.NFC"/> 23 <uses-permission android:name="android.permission.NFC"/>
25 <uses-permission android:name="android.permission.RECORD_AUDIO"/> 24 <uses-permission android:name="android.permission.RECORD_AUDIO"/>
26 <uses-permission android:name="android.permission.VIBRATE"/> 25 <uses-permission android:name="android.permission.VIBRATE"/>
27 <uses-permission android:name="android.permission.WAKE_LOCK"/> 26 <uses-permission android:name="android.permission.WAKE_LOCK"/>
28 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/> 27 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
29 <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> 28 <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 <!-- Media route controllers to use for remote playback (cast). 235 <!-- Media route controllers to use for remote playback (cast).
237 This is here, rather than in code, since it varies between upstream and downstream, 236 This is here, rather than in code, since it varies between upstream and downstream,
238 yet we need this list of classes in the notification service, which belongs upstream 237 yet we need this list of classes in the notification service, which belongs upstream
239 and doesn't run the downstream Clank startup code. The Cast code wi ll, for each media element, 238 and doesn't run the downstream Clank startup code. The Cast code wi ll, for each media element,
240 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 239 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
241 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones --> 240 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones -->
242 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 241 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
243 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 242 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
244 </application> 243 </application>
245 </manifest> 244 </manifest>
OLDNEW
« no previous file with comments | « no previous file | device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698