M42 snap browser
Change-Id: If52741ad5e34241aa9f928244942a33a91610e58
diff --git a/src_system/AndroidManifest.xml b/src_system/AndroidManifest.xml
index f7b1578..ff288f8 100644
--- a/src_system/AndroidManifest.xml
+++ b/src_system/AndroidManifest.xml
@@ -33,6 +33,7 @@
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="android.permission.SEND_DOWNLOAD_COMPLETED_INTENTS" />
@@ -316,106 +317,137 @@
android:exported="false"
android:grantUriPermissions="true"/>
+
+ <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"
+ android:value="3"/>
+
+ <service android:name="org.chromium.content.app.PrivilegedProcessService0"
+ android:process=":privileged_process0"
+ android:isolatedProcess="false"
+ android:exported="false" />
+
+ <service android:name="org.chromium.content.app.PrivilegedProcessService1"
+ android:process=":privileged_process1"
+ android:isolatedProcess="false"
+ android:exported="false" />
+
+ <service android:name="org.chromium.content.app.PrivilegedProcessService2"
+ android:process=":privileged_process2"
+ android:isolatedProcess="false"
+ android:exported="false" />
+
+
+ <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES"
+ android:value="20"/>
+
<service android:name="org.chromium.content.app.SandboxedProcessService0"
android:process=":sandboxed_process0"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService1"
android:process=":sandboxed_process1"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService2"
android:process=":sandboxed_process2"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService3"
android:process=":sandboxed_process3"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService4"
android:process=":sandboxed_process4"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService5"
android:process=":sandboxed_process5"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService6"
android:process=":sandboxed_process6"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService7"
android:process=":sandboxed_process7"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService8"
android:process=":sandboxed_process8"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService9"
android:process=":sandboxed_process9"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService10"
android:process=":sandboxed_process10"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService11"
android:process=":sandboxed_process11"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService12"
android:process=":sandboxed_process12"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService13"
android:process=":sandboxed_process13"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService14"
android:process=":sandboxed_process14"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService15"
android:process=":sandboxed_process15"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService16"
android:process=":sandboxed_process16"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService17"
android:process=":sandboxed_process17"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService18"
android:process=":sandboxed_process18"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService19"
android:process=":sandboxed_process19"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
+ <!-- Provider for FileProvider. -->
+ <provider android:name="android.support.v4.content.FileProvider"
+ android:authorities="com.android.browser.FileProvider"
+ android:exported="false"
+ android:grantUriPermissions="true">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/file_paths" />
+ </provider>
</application>
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="19" />