Chromium Code Reviews| 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.chrome.testshell"> | 10 package="org.chromium.chrome.testshell"> |
| 11 | 11 |
| 12 <permission android:name="org.chromium.chrome.testshell.permission.SANDBOX" | 12 <permission android:name="org.chromium.chrome.testshell.permission.SANDBOX" |
| 13 android:protectionLevel="signature" /> | 13 android:protectionLevel="signature" /> |
| 14 | 14 |
| 15 <application android:name="org.chromium.chrome.testshell.ChromiumTestShellAp plication" | 15 <application android:name="org.chromium.chrome.testshell.ChromiumTestShellAp plication" |
| 16 android:label="ChromiumTestShell"> | 16 android:label="ChromiumTestShell"> |
| 17 <activity android:name="org.chromium.chrome.testshell.ChromiumTestShellA ctivity" | 17 <activity android:name="org.chromium.chrome.testshell.ChromiumTestShellA ctivity" |
| 18 android:label="ChromiumTestShellActivity" | 18 android:label="ChromiumTestShellActivity" |
| 19 android:launchMode="singleTask" | 19 android:launchMode="singleTask" |
| 20 android:theme="@android:style/Theme.Holo.Light.NoActionBar" | 20 android:theme="@android:style/Theme.Holo.Light.NoActionBar" |
| 21 android:configChanges="orientation|keyboardHidden|keyboard|scr eenSize" | 21 android:configChanges="orientation|keyboardHidden|keyboard|scr eenSize" |
| 22 android:hardwareAccelerated="true"> | 22 android:hardwareAccelerated="true"> |
| 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 <activity android:name="org.chromium.sync.test.util.MockGrantCredentials PermissionActivity" | |
| 29 android:exported="true"> | |
| 30 <intent-filter> | |
| 31 <action android:name="android.intent.action.VIEW" /> | |
| 32 <category android:name="android.intent.category.DEFAULT" /> | |
| 33 </intent-filter> | |
| 34 </activity> | |
| 28 <!-- The following service entries exist in order to allow us to | 35 <!-- The following service entries exist in order to allow us to |
| 29 start more than one sandboxed process. --> | 36 start more than one sandboxed process. --> |
| 30 | 37 |
| 31 <!-- NOTE: If you change the values of "android:process" for any of the below services, | 38 <!-- 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. --> | 39 you also need to update kHelperProcessExecutableName in chrome_cons tants.cc. --> |
| 33 <service android:name="org.chromium.content.app.SandboxedProcessService0 " | 40 <service android:name="org.chromium.content.app.SandboxedProcessService0 " |
| 34 android:process=":sandboxed_process0" | 41 android:process=":sandboxed_process0" |
| 35 android:permission="org.chromium.content_shell.permission.SANDB OX" | 42 android:permission="org.chromium.content_shell.permission.SANDB OX" |
| 36 android:isolatedProcess="true" | 43 android:isolatedProcess="true" |
| 37 android:exported="false" /> | 44 android:exported="false" /> |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 89 android:process=":sandboxed_process11" | 96 android:process=":sandboxed_process11" |
| 90 android:permission="org.chromium.content_shell.permission.SANDB OX" | 97 android:permission="org.chromium.content_shell.permission.SANDB OX" |
| 91 android:isolatedProcess="true" | 98 android:isolatedProcess="true" |
| 92 android:exported="false" /> | 99 android:exported="false" /> |
| 93 <service android:name="org.chromium.content.app.SandboxedProcessService1 2" | 100 <service android:name="org.chromium.content.app.SandboxedProcessService1 2" |
| 94 android:process=":sandboxed_process12" | 101 android:process=":sandboxed_process12" |
| 95 android:permission="org.chromium.content_shell.permission.SANDB OX" | 102 android:permission="org.chromium.content_shell.permission.SANDB OX" |
| 96 android:isolatedProcess="true" | 103 android:isolatedProcess="true" |
| 97 android:exported="false" /> | 104 android:exported="false" /> |
| 98 | 105 |
| 106 <!-- Receiver for GCM messages. Rebroadcasts them locally for sync. --> | |
| 107 <receiver android:exported="true" | |
| 108 android:name="com.google.ipc.invalidation.external.client.cont rib.MultiplexingGcmListener$GCMReceiver" | |
| 109 android:permission="com.google.android.c2dm.permission.SEND"> | |
| 110 <intent-filter> | |
| 111 <action android:name="com.google.android.c2dm.intent.RECEIVE" /> | |
| 112 <action android:name="com.google.android.c2dm.intent.REGISTRATIO N" /> | |
| 113 <category android:name="org.chromium.chrome.testshell"/> | |
| 114 </intent-filter> | |
| 115 </receiver> | |
| 116 <service android:exported="false" | |
| 117 android:name="com.google.ipc.invalidation.external.client.contr ib.MultiplexingGcmListener"> | |
| 118 <meta-data android:name="sender_ids" | |
| 119 android:value="cloudprint.c2dm@gmail.com,ipc.invalidation @gmail.com"/> | |
| 120 </service> | |
| 121 | |
| 122 <!-- Notification service for sync. --> | |
| 123 <meta-data android:name="ipc.invalidation.ticl.listener_service_class" | |
| 124 android:value="org.chromium.sync.notifier.InvalidationService "/> | |
| 125 <service android:name="org.chromium.sync.notifier.InvalidationService" | |
| 126 android:exported="false"> | |
| 127 <intent-filter> | |
| 128 <action android:name="com.google.ipc.invalidation.AUTH_TOKEN_REQ UEST"/> | |
| 129 </intent-filter> | |
| 130 </service> | |
| 131 <service android:exported="false" | |
| 132 android:name="com.google.ipc.invalidation.ticl.android2.TiclSer vice"/> | |
| 133 <service android:exported="false" | |
| 134 android:name="com.google.ipc.invalidation.ticl.android2.channel .AndroidMessageSenderService"/> | |
| 135 <receiver android:exported="false" | |
| 136 android:name="com.google.ipc.invalidation.ticl.android2.Androi dInternalScheduler$AlarmReceiver"/> | |
| 137 <receiver android:exported="false" | |
| 138 android:name="com.google.ipc.invalidation.external.client.cont rib.AndroidListener$AlarmReceiver"/> | |
| 139 | |
| 140 <!-- Notification service multiplexed GCM receiver --> | |
| 141 <service android:exported="false" | |
| 142 android:name="com.google.ipc.invalidation.ticl.android2.channel .AndroidMessageReceiverService" | |
| 143 android:enabled="true"/> | |
| 144 <receiver android:exported="false" | |
| 145 android:name="com.google.ipc.invalidation.ticl.android2.channe l.AndroidMessageReceiverService$Receiver"> | |
| 146 <intent-filter> | |
| 147 <action android:name="com.google.ipc.invalidation.gcmmplex.EVENT " /> | |
| 148 </intent-filter> | |
| 149 </receiver> | |
| 150 | |
| 151 <provider android:name="org.chromium.chrome.browser.ChromeBrowserProvide r" | |
| 152 android:authorities="org.chromium.chrome.testshell" | |
| 153 android:exported="true" /> | |
| 154 | |
| 99 <!-- Sync adapter for browser sync. --> | 155 <!-- Sync adapter for browser sync. --> |
| 100 <service android:exported="false" | 156 <service android:exported="false" |
| 101 android:name="org.chromium.chrome.testshell.sync.ChromiumTestSh ellSyncAdapterService"> | 157 android:name="org.chromium.chrome.testshell.sync.ChromiumTestSh ellSyncAdapterService"> |
| 102 <intent-filter> | 158 <intent-filter> |
| 103 <action android:name="android.content.SyncAdapter" /> | 159 <action android:name="android.content.SyncAdapter" /> |
| 104 </intent-filter> | 160 </intent-filter> |
| 105 <meta-data android:name="android.content.SyncAdapter" | 161 <meta-data android:name="android.content.SyncAdapter" |
| 106 android:resource="@xml/syncadapter" /> | 162 android:resource="@xml/syncadapter" /> |
| 107 </service> | 163 </service> |
| 108 | |
| 109 <!-- Name of the class implementing the invalidation client, for sync no tifications. --> | |
| 110 <meta-data android:name="org.chromium.sync.notifier.IMPLEMENTING_CLASS_N AME" | |
| 111 android:value="org.chromium.sync.notifier.TEST_VALUE" /> | |
| 112 </application> | 164 </application> |
| 113 | 165 |
| 114 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" /> | 166 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" /> |
|
Yaron
2013/08/27 18:19:23
Nit: move this stuff above <application> (it's an
nyquist
2013/08/30 00:55:43
Done.
| |
| 115 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> | 167 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> |
| 116 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> | 168 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> |
| 117 <uses-permission android:name="android.permission.CAMERA" /> | 169 <uses-permission android:name="android.permission.CAMERA" /> |
| 118 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> | 170 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> |
| 119 <uses-permission android:name="android.permission.INTERNET"/> | 171 <uses-permission android:name="android.permission.INTERNET"/> |
| 120 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> | 172 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> |
| 121 <uses-permission android:name="android.permission.RECORD_AUDIO"/> | 173 <uses-permission android:name="android.permission.RECORD_AUDIO"/> |
| 122 <uses-permission android:name="android.permission.VIBRATE"/> | 174 <uses-permission android:name="android.permission.VIBRATE"/> |
| 123 <uses-permission android:name="android.permission.WAKE_LOCK"/> | 175 <uses-permission android:name="android.permission.WAKE_LOCK"/> |
| 124 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/> | 176 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/> |
| 125 <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> | 177 <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> |
| 126 <uses-permission android:name="android.permission.USE_CREDENTIALS" /> | 178 <uses-permission android:name="android.permission.USE_CREDENTIALS" /> |
| 127 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> | 179 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> |
| 180 <!-- Only Chrome can receive the messages and registration result for GCM -- > | |
| 181 <permission android:name="org.chromium.chrome.testshell.permission.C2D_MESSA GE" | |
| 182 android:protectionLevel="signature" /> | |
| 183 <uses-permission android:name="org.chromium.chrome.testshell.permission.C2D_ MESSAGE" /> | |
| 184 <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" / > | |
| 128 </manifest> | 185 </manifest> |
| OLD | NEW |