| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 | 2 |
| 3 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 <!-- Copyright (c) 2012 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.content_shell_apk"> | 10 package="org.chromium.content_shell_apk"> |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 <intent-filter> | 23 <intent-filter> |
| 24 <action android:name="android.intent.action.MAIN"/> | 24 <action android:name="android.intent.action.MAIN"/> |
| 25 <category android:name="android.intent.category.LAUNCHER"/> | 25 <category android:name="android.intent.category.LAUNCHER"/> |
| 26 </intent-filter> | 26 </intent-filter> |
| 27 </activity> | 27 </activity> |
| 28 <!-- The following service entries exist in order to allow us to | 28 <!-- The following service entries exist in order to allow us to |
| 29 start more than one sandboxed process. --> | 29 start more than one sandboxed process. --> |
| 30 | 30 |
| 31 <!-- NOTE: If you change the values of "android:process" for any of the
below services, | 31 <!-- NOTE: If you change the values of "android:process" for any of the
below services, |
| 32 you also need to update kHelperProcessExecutableName in chrome_cons
tants.cc. --> | 32 you also need to update kHelperProcessExecutableName in chrome_cons
tants.cc. --> |
| 33 <service android:name="org.chromium.content.app.SandboxedProcessService0
" | 33 <service android:name="org.chromium.content_public.app.SandboxedProcessS
ervice0" |
| 34 android:process=":sandboxed_process0" | 34 android:process=":sandboxed_process0" |
| 35 android:permission="org.chromium.content_shell.permission.SANDB
OX" | 35 android:permission="org.chromium.content_shell.permission.SANDB
OX" |
| 36 android:isolatedProcess="true" | 36 android:isolatedProcess="true" |
| 37 android:exported="false" /> | 37 android:exported="false" /> |
| 38 <service android:name="org.chromium.content.app.SandboxedProcessService1
" | 38 <service android:name="org.chromium.content_public.app.SandboxedProcessS
ervice1" |
| 39 android:process=":sandboxed_process1" | 39 android:process=":sandboxed_process1" |
| 40 android:permission="org.chromium.content_shell.permission.SANDB
OX" | 40 android:permission="org.chromium.content_shell.permission.SANDB
OX" |
| 41 android:isolatedProcess="true" | 41 android:isolatedProcess="true" |
| 42 android:exported="false" /> | 42 android:exported="false" /> |
| 43 <service android:name="org.chromium.content.app.SandboxedProcessService2
" | 43 <service android:name="org.chromium.content_public.app.SandboxedProcessS
ervice2" |
| 44 android:process=":sandboxed_process2" | 44 android:process=":sandboxed_process2" |
| 45 android:permission="org.chromium.content_shell.permission.SANDB
OX" | 45 android:permission="org.chromium.content_shell.permission.SANDB
OX" |
| 46 android:isolatedProcess="true" | 46 android:isolatedProcess="true" |
| 47 android:exported="false" /> | 47 android:exported="false" /> |
| 48 <service android:name="org.chromium.content.app.SandboxedProcessService3
" | 48 <service android:name="org.chromium.content_public.app.SandboxedProcessS
ervice3" |
| 49 android:process=":sandboxed_process3" | 49 android:process=":sandboxed_process3" |
| 50 android:permission="org.chromium.content_shell.permission.SANDB
OX" | 50 android:permission="org.chromium.content_shell.permission.SANDB
OX" |
| 51 android:isolatedProcess="true" | 51 android:isolatedProcess="true" |
| 52 android:exported="false" /> | 52 android:exported="false" /> |
| 53 <service android:name="org.chromium.content.app.SandboxedProcessService4
" | 53 <service android:name="org.chromium.content_public.app.SandboxedProcessS
ervice4" |
| 54 android:process=":sandboxed_process4" | 54 android:process=":sandboxed_process4" |
| 55 android:permission="org.chromium.content_shell.permission.SANDB
OX" | 55 android:permission="org.chromium.content_shell.permission.SANDB
OX" |
| 56 android:isolatedProcess="true" | 56 android:isolatedProcess="true" |
| 57 android:exported="false" /> | 57 android:exported="false" /> |
| 58 <service android:name="org.chromium.content.app.SandboxedProcessService5
" | 58 <service android:name="org.chromium.content_public.app.SandboxedProcessS
ervice5" |
| 59 android:process=":sandboxed_process5" | 59 android:process=":sandboxed_process5" |
| 60 android:permission="org.chromium.content_shell.permission.SANDB
OX" | 60 android:permission="org.chromium.content_shell.permission.SANDB
OX" |
| 61 android:isolatedProcess="true" | 61 android:isolatedProcess="true" |
| 62 android:exported="false" /> | 62 android:exported="false" /> |
| 63 <service android:name="org.chromium.content.app.SandboxedProcessService6
" | 63 <service android:name="org.chromium.content_public.app.SandboxedProcessS
ervice6" |
| 64 android:process=":sandboxed_process6" | 64 android:process=":sandboxed_process6" |
| 65 android:permission="org.chromium.content_shell.permission.SANDB
OX" | 65 android:permission="org.chromium.content_shell.permission.SANDB
OX" |
| 66 android:isolatedProcess="true" | 66 android:isolatedProcess="true" |
| 67 android:exported="false" /> | 67 android:exported="false" /> |
| 68 <service android:name="org.chromium.content.app.SandboxedProcessService7
" | 68 <service android:name="org.chromium.content_public.app.SandboxedProcessS
ervice7" |
| 69 android:process=":sandboxed_process7" | 69 android:process=":sandboxed_process7" |
| 70 android:permission="org.chromium.content_shell.permission.SANDB
OX" | 70 android:permission="org.chromium.content_shell.permission.SANDB
OX" |
| 71 android:isolatedProcess="true" | 71 android:isolatedProcess="true" |
| 72 android:exported="false" /> | 72 android:exported="false" /> |
| 73 <service android:name="org.chromium.content.app.SandboxedProcessService8
" | 73 <service android:name="org.chromium.content_public.app.SandboxedProcessS
ervice8" |
| 74 android:process=":sandboxed_process8" | 74 android:process=":sandboxed_process8" |
| 75 android:permission="org.chromium.content_shell.permission.SANDB
OX" | 75 android:permission="org.chromium.content_shell.permission.SANDB
OX" |
| 76 android:isolatedProcess="true" | 76 android:isolatedProcess="true" |
| 77 android:exported="false" /> | 77 android:exported="false" /> |
| 78 <service android:name="org.chromium.content.app.SandboxedProcessService9
" | 78 <service android:name="org.chromium.content_public.app.SandboxedProcessS
ervice9" |
| 79 android:process=":sandboxed_process9" | 79 android:process=":sandboxed_process9" |
| 80 android:permission="org.chromium.content_shell.permission.SANDB
OX" | 80 android:permission="org.chromium.content_shell.permission.SANDB
OX" |
| 81 android:isolatedProcess="true" | 81 android:isolatedProcess="true" |
| 82 android:exported="false" /> | 82 android:exported="false" /> |
| 83 <service android:name="org.chromium.content.app.SandboxedProcessService1
0" | 83 <service android:name="org.chromium.content_public.app.SandboxedProcessS
ervice10" |
| 84 android:process=":sandboxed_process10" | 84 android:process=":sandboxed_process10" |
| 85 android:permission="org.chromium.content_shell.permission.SANDB
OX" | 85 android:permission="org.chromium.content_shell.permission.SANDB
OX" |
| 86 android:isolatedProcess="true" | 86 android:isolatedProcess="true" |
| 87 android:exported="false" /> | 87 android:exported="false" /> |
| 88 <service android:name="org.chromium.content.app.SandboxedProcessService1
1" | 88 <service android:name="org.chromium.content_public.app.SandboxedProcessS
ervice11" |
| 89 android:process=":sandboxed_process11" | 89 android:process=":sandboxed_process11" |
| 90 android:permission="org.chromium.content_shell.permission.SANDB
OX" | 90 android:permission="org.chromium.content_shell.permission.SANDB
OX" |
| 91 android:isolatedProcess="true" | 91 android:isolatedProcess="true" |
| 92 android:exported="false" /> | 92 android:exported="false" /> |
| 93 <service android:name="org.chromium.content.app.SandboxedProcessService1
2" | 93 <service android:name="org.chromium.content_public.app.SandboxedProcessS
ervice12" |
| 94 android:process=":sandboxed_process12" | 94 android:process=":sandboxed_process12" |
| 95 android:permission="org.chromium.content_shell.permission.SANDB
OX" | 95 android:permission="org.chromium.content_shell.permission.SANDB
OX" |
| 96 android:isolatedProcess="true" | 96 android:isolatedProcess="true" |
| 97 android:exported="false" /> | 97 android:exported="false" /> |
| 98 </application> | 98 </application> |
| 99 | 99 |
| 100 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" /> | 100 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" /> |
| 101 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> | 101 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> |
| 102 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> | 102 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> |
| 103 <uses-permission android:name="android.permission.CAMERA"/> | 103 <uses-permission android:name="android.permission.CAMERA"/> |
| 104 <uses-permission android:name="android.permission.INTERNET"/> | 104 <uses-permission android:name="android.permission.INTERNET"/> |
| 105 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> | 105 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> |
| 106 <uses-permission android:name="android.permission.RECORD_AUDIO"/> | 106 <uses-permission android:name="android.permission.RECORD_AUDIO"/> |
| 107 <uses-permission android:name="android.permission.VIBRATE"/> | 107 <uses-permission android:name="android.permission.VIBRATE"/> |
| 108 <uses-permission android:name="android.permission.WAKE_LOCK"/> | 108 <uses-permission android:name="android.permission.WAKE_LOCK"/> |
| 109 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> | 109 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> |
| 110 </manifest> | 110 </manifest> |
| OLD | NEW |