Chromium Code Reviews| Index: chrome/android/testshell/java/AndroidManifest.xml |
| diff --git a/chrome/android/testshell/java/AndroidManifest.xml b/chrome/android/testshell/java/AndroidManifest.xml |
| index 4d8f7a519783cba5294f6ea885107cc76756c35d..a064b7b0de5739ce8206ef8692efc7dae4a3fd18 100644 |
| --- a/chrome/android/testshell/java/AndroidManifest.xml |
| +++ b/chrome/android/testshell/java/AndroidManifest.xml |
| @@ -25,6 +25,13 @@ |
| <category android:name="android.intent.category.LAUNCHER" /> |
| </intent-filter> |
| </activity> |
| + <activity android:name="org.chromium.sync.test.util.MockGrantCredentialsPermissionActivity" |
| + android:exported="true"> |
| + <intent-filter> |
| + <action android:name="android.intent.action.VIEW" /> |
| + <category android:name="android.intent.category.DEFAULT" /> |
| + </intent-filter> |
| + </activity> |
| <!-- The following service entries exist in order to allow us to |
| start more than one sandboxed process. --> |
| @@ -96,6 +103,55 @@ |
| android:isolatedProcess="true" |
| android:exported="false" /> |
| + <!-- Receiver for GCM messages. Rebroadcasts them locally for sync. --> |
| + <receiver android:exported="true" |
| + android:name="com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener$GCMReceiver" |
| + android:permission="com.google.android.c2dm.permission.SEND"> |
| + <intent-filter> |
| + <action android:name="com.google.android.c2dm.intent.RECEIVE" /> |
| + <action android:name="com.google.android.c2dm.intent.REGISTRATION" /> |
| + <category android:name="org.chromium.chrome.testshell"/> |
| + </intent-filter> |
| + </receiver> |
| + <service android:exported="false" |
| + android:name="com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener"> |
| + <meta-data android:name="sender_ids" |
| + android:value="cloudprint.c2dm@gmail.com,ipc.invalidation@gmail.com"/> |
| + </service> |
| + |
| + <!-- Notification service for sync. --> |
| + <meta-data android:name="ipc.invalidation.ticl.listener_service_class" |
| + android:value="org.chromium.sync.notifier.InvalidationService"/> |
| + <service android:name="org.chromium.sync.notifier.InvalidationService" |
| + android:exported="false"> |
| + <intent-filter> |
| + <action android:name="com.google.ipc.invalidation.AUTH_TOKEN_REQUEST"/> |
| + </intent-filter> |
| + </service> |
| + <service android:exported="false" |
| + android:name="com.google.ipc.invalidation.ticl.android2.TiclService"/> |
| + <service android:exported="false" |
| + android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageSenderService"/> |
| + <receiver android:exported="false" |
| + android:name="com.google.ipc.invalidation.ticl.android2.AndroidInternalScheduler$AlarmReceiver"/> |
| + <receiver android:exported="false" |
| + android:name="com.google.ipc.invalidation.external.client.contrib.AndroidListener$AlarmReceiver"/> |
| + |
| + <!-- Notification service multiplexed GCM receiver --> |
| + <service android:exported="false" |
| + android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageReceiverService" |
| + android:enabled="true"/> |
| + <receiver android:exported="false" |
| + android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageReceiverService$Receiver"> |
| + <intent-filter> |
| + <action android:name="com.google.ipc.invalidation.gcmmplex.EVENT" /> |
| + </intent-filter> |
| + </receiver> |
| + |
| + <provider android:name="org.chromium.chrome.browser.ChromeBrowserProvider" |
| + android:authorities="org.chromium.chrome.testshell" |
| + android:exported="true" /> |
| + |
| <!-- Sync adapter for browser sync. --> |
| <service android:exported="false" |
| android:name="org.chromium.chrome.testshell.sync.ChromiumTestShellSyncAdapterService"> |
| @@ -105,10 +161,6 @@ |
| <meta-data android:name="android.content.SyncAdapter" |
| android:resource="@xml/syncadapter" /> |
| </service> |
| - |
| - <!-- Name of the class implementing the invalidation client, for sync notifications. --> |
| - <meta-data android:name="org.chromium.sync.notifier.IMPLEMENTING_CLASS_NAME" |
| - android:value="org.chromium.sync.notifier.TEST_VALUE" /> |
| </application> |
| <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.
|
| @@ -125,4 +177,9 @@ |
| <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> |
| <uses-permission android:name="android.permission.USE_CREDENTIALS" /> |
| <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> |
| + <!-- Only Chrome can receive the messages and registration result for GCM --> |
| + <permission android:name="org.chromium.chrome.testshell.permission.C2D_MESSAGE" |
| + android:protectionLevel="signature" /> |
| + <uses-permission android:name="org.chromium.chrome.testshell.permission.C2D_MESSAGE" /> |
| + <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" /> |
| </manifest> |