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

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

Issue 2815633004: bluetooth: Stop requesting Bluetooth permission in <M devices (Closed)
Patch Set: Created 3 years, 8 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 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <!-- 6 <!--
7 Note: This is a jinja2 template, processed at build time into the final manifest . 7 Note: This is a jinja2 template, processed at build time into the final manifest .
8 8
9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden 9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden
10 by a child template that "extends" this file. 10 by a child template that "extends" this file.
(...skipping 12 matching lines...) Expand all
23 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> 23 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
24 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 24 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
25 25
26 <!-- 26 <!--
27 Enable runtime permissions as uses-permission in tip of tree builds 27 Enable runtime permissions as uses-permission in tip of tree builds
28 only for ease of development on Android L and earlier. For consumer 28 only for ease of development on Android L and earlier. For consumer
29 channels use "runtime permission" uses-permission-sdk-m which provides 29 channels use "runtime permission" uses-permission-sdk-m which provides
30 permission on Android M and later without a prompt. 30 permission on Android M and later without a prompt.
31 --> 31 -->
32 {% if channel in ['default'] %} 32 {% if channel in ['default'] %}
33 <uses-permission android:name="android.permission.BLUETOOTH"/>
34 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
35 <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAG ES"/> 33 <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAG ES"/>
36 {% endif %} 34 {% endif %}
37 <uses-permission-sdk-m android:name="android.permission.BLUETOOTH"/> 35 <uses-permission-sdk-m android:name="android.permission.BLUETOOTH"/>
38 <uses-permission-sdk-m android:name="android.permission.BLUETOOTH_ADMIN"/> 36 <uses-permission-sdk-m android:name="android.permission.BLUETOOTH_ADMIN"/>
39 <uses-permission-sdk-m android:name="android.permission.REQUEST_INSTALL_PACK AGES"/> 37 <uses-permission-sdk-m android:name="android.permission.REQUEST_INSTALL_PACK AGES"/>
40 38
41 <uses-permission android:name="android.permission.CAMERA" /> 39 <uses-permission android:name="android.permission.CAMERA" />
42 <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICAT ION" /> 40 <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICAT ION" />
43 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> 41 <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
44 <uses-permission android:name="android.permission.INTERNET"/> 42 <uses-permission android:name="android.permission.INTERNET"/>
(...skipping 962 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 1005 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
1008 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 1006 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
1009 The downstream manifest replaces this block, and hence replaces the list of media route 1007 The downstream manifest replaces this block, and hence replaces the list of media route
1010 controllers with its own list. --> 1008 controllers with its own list. -->
1011 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 1009 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
1012 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 1010 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
1013 1011
1014 {% endblock %} 1012 {% endblock %}
1015 </application> 1013 </application>
1016 </manifest> 1014 </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