projects / platform / framework / web / crosswalk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git] / src / chrome / android / shell / java / AndroidManifest.xml
diff --git a/src/chrome/android/shell/java/AndroidManifest.xml b/src/chrome/android/shell/java/AndroidManifest.xml
index 442b5b5..31f6e77 100644 (file)
--- a/src/chrome/android/shell/java/AndroidManifest.xml
+++ b/src/chrome/android/shell/java/AndroidManifest.xml
@@ -9,7 +9,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.chromium.chrome.shell">
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="20" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
     <permission android:name="org.chromium.chrome.shell.permission.SANDBOX"
             android:protectionLevel="signature" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
@@ -19,6 +19,7 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+    <uses-permission android:name="android.permission.NFC"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
@@ -42,7 +43,7 @@
             android:label="Chrome Shell">
         <activity android:name="org.chromium.chrome.shell.ChromeShellActivity"
                   android:launchMode="singleTask"
-                  android:theme="@android:style/Theme.Holo.Light.NoActionBar"
+                  android:theme="@style/MainTheme"
                   android:configChanges="orientation|keyboardHidden|keyboard|screenSize"
                   android:hardwareAccelerated="true">
               <intent-filter>
@@ -60,108 +61,15 @@
         <!-- The following service entries exist in order to allow us to
              start more than one sandboxed process. -->
 
-        <!-- NOTE: If you change the values of "android:process" for any of the below services,
+        <!-- NOTE: If you change the value of "android:process" for the below services,
              you also need to update kHelperProcessExecutableName in chrome_constants.cc. -->
-        <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"
+        {% for i in range(20) %}
+        <service android:name="org.chromium.content.app.SandboxedProcessService{{ i }}"
+                 android:process=":sandboxed_process{{ i }}"
                  android:permission="org.chromium.content_shell.permission.SANDBOX"
                  android:isolatedProcess="true"
                  android:exported="false" />
+        {% endfor %}
 
         <!-- Receiver for GCM messages. Rebroadcasts them locally for sync. -->
         <receiver android:exported="true"
@@ -181,8 +89,8 @@
 
         <!-- 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:value="org.chromium.components.invalidation.InvalidationClientService"/>
+        <service android:name="org.chromium.components.invalidation.InvalidationClientService"
                  android:exported="false">
             <intent-filter>
                 <action android:name="com.google.ipc.invalidation.AUTH_TOKEN_REQUEST"/>
@@ -251,4 +159,4 @@
                    android:value="org.chromium.content.browser.SmartClipProvider" />
 
     </application>
-</manifest>
+</manifest>
\ No newline at end of file
Domain: Web Framework / Uncategorized;