Merge pull request crosswalk-project#3357 from rakuco/revert-wifi-dir…

…ect-pr Revert "Wifi Direct Experimental API initial contribution"
alixliu · Nov 5, 2015 · f6282c0 · f6282c0
2 parents d4cad03 + 2c526ae
commit f6282c0
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 632 deletions.
diff --git a/app/android/app_template/AndroidManifest.xml b/app/android/app_template/AndroidManifest.xml
@@ -26,9 +26,7 @@
 
   <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
   <uses-permission android:name="android.permission.CAMERA"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>

diff --git a/app/android/runtime_client_embedded_shell/AndroidManifest.xml b/app/android/runtime_client_embedded_shell/AndroidManifest.xml
@@ -31,9 +31,7 @@
   <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
   <uses-permission android:name="android.permission.CAMERA"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>

diff --git a/app/android/runtime_client_shell/AndroidManifest.xml b/app/android/runtime_client_shell/AndroidManifest.xml
@@ -31,9 +31,7 @@
   <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
   <uses-permission android:name="android.permission.CAMERA"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>

diff --git a/app/tools/android/handle_permissions.py b/app/tools/android/handle_permissions.py
@@ -42,12 +42,7 @@
     'presentation': [],
     'rawsockets': [],
     'screenorientation': [],
-    'vibration': ['android.permission.VIBRATE'],
-    'wifidirect': ['android.permission.ACCESS_WIFI_STATE',
-                   'android.permission.CHANGE_WIFI_STATE',
-                   'android.permission.CHANGE_NETWORK_STATE',
-                   'android.permission.INTERNET',
-                   'android.permission.ACCESS_NETWORK_STATE']
+    'vibration': ['android.permission.VIBRATE']
 }
 
 

diff --git a/app/tools/android/make_apk_test.py b/app/tools/android/make_apk_test.py
@@ -235,8 +235,7 @@ def checkApk(self, apk_path, arch, keystore_path=None):
                                 # 'snapshot_blob.bin',
                                 'device_capabilities_api.js',
                                 'launch_screen_api.js',
-                                'presentation_api.js',
-                                'wifidirect_api.js']
+                                'presentation_api.js']
       for res_file in embedded_related_files:
         self.assertTrue(out.find(res_file) != -1)
     if arch == 'x86':

diff --git a/build/android/generate_xwalk_core_library.py b/build/android/generate_xwalk_core_library.py
@@ -85,8 +85,7 @@ def CopyJSBindingFiles(project_source, out_project_dir):
       'xwalk/runtime/android/core_internal/src/org/xwalk/core/'
       + 'internal/extension/api/device_capabilities/device_capabilities_api.js',
       'xwalk/runtime/android/core_internal/src/org/xwalk/core/'
-      + 'internal/extension/api/messaging/messaging_api.js',
-      'xwalk/experimental/wifidirect/wifidirect_api.js'
+      + 'internal/extension/api/messaging/messaging_api.js'
   ]
 
   # Copy JS binding file to assets/jsapi folder.

diff --git a/experimental/wifidirect/OWNERS b/experimental/wifidirect/OWNERS
diff --git a/experimental/wifidirect/wifidirect_api.js b/experimental/wifidirect/wifidirect_api.js
diff --git a/runtime/android/core/src/org/xwalk/core/XWalkActivity.java b/runtime/android/core/src/org/xwalk/core/XWalkActivity.java
@@ -77,9 +77,7 @@
  *
  * <pre>
  * &lt;uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /&gt;
- * &lt;uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /&gt;
  * &lt;uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /&gt;
- * &lt;uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /&gt;
  * &lt;uses-permission android:name="android.permission.INTERNET" /&gt;
  * &lt;uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /&gt;
  * </pre>

diff --git a/runtime/android/core/src/org/xwalk/core/XWalkUpdater.java b/runtime/android/core/src/org/xwalk/core/XWalkUpdater.java
@@ -100,9 +100,7 @@
  *
  * <pre>
  * &lt;uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /&gt;
- * &lt;uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /&gt;
  * &lt;uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /&gt;
- * &lt;uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /&gt;
  * &lt;uses-permission android:name="android.permission.INTERNET" /&gt;
  * &lt;uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /&gt;
  * </pre>

diff --git a/...e/android/core_internal/src/org/xwalk/core/internal/extension/BuiltinXWalkExtensions.java b/...e/android/core_internal/src/org/xwalk/core/internal/extension/BuiltinXWalkExtensions.java
@@ -15,7 +15,6 @@
 import org.xwalk.core.internal.extension.api.launchscreen.LaunchScreenExtension;
 import org.xwalk.core.internal.extension.api.messaging.Messaging;
 import org.xwalk.core.internal.extension.api.presentation.PresentationExtension;
-import org.xwalk.core.internal.extension.api.wifidirect.WifiDirect;
 
 import android.app.Activity;
 import android.content.Context;
@@ -90,18 +89,6 @@ public static void load(Context context, Activity activity) {
                 Log.w(TAG, "Failed to read JS API file: " + Messaging.JS_API_PATH);
             }
         }
-
-        {
-            String jsApiContent = "";
-            try {
-                jsApiContent = getExtensionJSFileContent(
-                        context, WifiDirect.JS_API_PATH, true);
-                sBuiltinExtensions.put(WifiDirect.JS_API_PATH,
-                        new WifiDirect(jsApiContent, activity));
-            } catch(IOException e) {
-                Log.w(TAG, "Failed to read JS API file: " + WifiDirect.JS_API_PATH);
-            }
-        }
     }