Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: mobile/android/base/AndroidManifest.xml.in

Issue 4819695857303552: Issue 2561 - Installing extensions should not be allowed until official support lands (Closed)
Patch Set: Created May 22, 2015, 1:41 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | mobile/android/chrome/content/browser.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #filter substitution 1 #filter substitution
2 <?xml version="1.0" encoding="utf-8"?> 2 <?xml version="1.0" encoding="utf-8"?>
3 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 3 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
4 package="@ANDROID_PACKAGE_NAME@" 4 package="@ANDROID_PACKAGE_NAME@"
5 android:installLocation="auto" 5 android:installLocation="auto"
6 android:versionCode="@ANDROID_VERSION_CODE@" 6 android:versionCode="@ANDROID_VERSION_CODE@"
7 android:versionName="@MOZ_APP_VERSION@" 7 android:versionName="@MOZ_APP_VERSION@"
8 #ifdef MOZ_ANDROID_SHARED_ID 8 #ifdef MOZ_ANDROID_SHARED_ID
9 android:sharedUserId="@MOZ_ANDROID_SHARED_ID@" 9 android:sharedUserId="@MOZ_ANDROID_SHARED_ID@"
10 #endif 10 #endif
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 <category android:name="android.intent.category.BROWSABLE" /> 194 <category android:name="android.intent.category.BROWSABLE" />
195 <data android:scheme="" /> 195 <data android:scheme="" />
196 <data android:scheme="http" /> 196 <data android:scheme="http" />
197 <data android:scheme="https" /> 197 <data android:scheme="https" />
198 </intent-filter> 198 </intent-filter>
199 199
200 <intent-filter> 200 <intent-filter>
201 <action android:name="android.intent.action.SEARCH" /> 201 <action android:name="android.intent.action.SEARCH" />
202 </intent-filter> 202 </intent-filter>
203 203
204 <!-- For XPI installs from websites and the download manager. --> 204 » <!-- For XPI installs from websites and the download manager. -->
205 <intent-filter> 205 » <!-- We disable XPI installation here because of https://issue s.adblockplus.org/ticket/2561 -->
206 <!-- <intent-filter>
206 <action android:name="android.intent.action.VIEW" /> 207 <action android:name="android.intent.action.VIEW" />
207 <category android:name="android.intent.category.DEFAULT" /> 208 <category android:name="android.intent.category.DEFAULT" />
208 <data android:scheme="file" /> 209 <data android:scheme="file" />
209 <data android:scheme="http" /> 210 <data android:scheme="http" />
210 <data android:scheme="https" /> 211 <data android:scheme="https" />
211 <data android:mimeType="application/x-xpinstall" /> 212 <data android:mimeType="application/x-xpinstall" />
212 </intent-filter> 213 </intent-filter> -->
213 214
214 <!-- For XPI installs from file: URLs. --> 215 <!-- For XPI installs from file: URLs. -->
215 <intent-filter> 216 » <!-- We disable XPI installation here because of https://issue s.adblockplus.org/ticket/2561 -->
217 <!-- <intent-filter>
216 <action android:name="android.intent.action.VIEW" /> 218 <action android:name="android.intent.action.VIEW" />
217 <category android:name="android.intent.category.DEFAULT" /> 219 <category android:name="android.intent.category.DEFAULT" />
218 <data android:host="" /> 220 <data android:host="" />
219 <data android:scheme="file" /> 221 <data android:scheme="file" />
220 <data android:pathPattern=".*\\.xpi" /> 222 <data android:pathPattern=".*\\.xpi" />
221 </intent-filter> 223 </intent-filter> -->
222 224
223 #ifdef MOZ_ANDROID_BEAM 225 #ifdef MOZ_ANDROID_BEAM
224 <intent-filter> 226 <intent-filter>
225 <action android:name="android.nfc.action.NDEF_DISCOVERED"/> 227 <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
226 <category android:name="android.intent.category.DEFAULT" /> 228 <category android:name="android.intent.category.DEFAULT" />
227 <data android:scheme="http" /> 229 <data android:scheme="http" />
228 <data android:scheme="https" /> 230 <data android:scheme="https" />
229 </intent-filter> 231 </intent-filter>
230 #endif 232 #endif
231 233
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 <permission android:name="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDE R" 463 <permission android:name="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDE R"
462 android:protectionLevel="signature"/> 464 android:protectionLevel="signature"/>
463 465
464 <permission android:name="@ANDROID_PACKAGE_NAME@.permissions.PASSWORD_PROVID ER" 466 <permission android:name="@ANDROID_PACKAGE_NAME@.permissions.PASSWORD_PROVID ER"
465 android:protectionLevel="signature"/> 467 android:protectionLevel="signature"/>
466 468
467 <permission android:name="@ANDROID_PACKAGE_NAME@.permissions.FORMHISTORY_PRO VIDER" 469 <permission android:name="@ANDROID_PACKAGE_NAME@.permissions.FORMHISTORY_PRO VIDER"
468 android:protectionLevel="signature"/> 470 android:protectionLevel="signature"/>
469 471
470 </manifest> 472 </manifest>
OLDNEW
« no previous file with comments | « no previous file | mobile/android/chrome/content/browser.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld