From a33ed0eabe94748b7ff6604af58dd25a0024bf04 Mon Sep 17 00:00:00 2001
From: goblin911 <goblinliu@gmail.com>
Date: Fri, 23 Aug 2013 16:00:07 +0800
Subject: asdf

---
 client/activity-demo/Piztor/AndroidManifest.xml | 31 +++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 client/activity-demo/Piztor/AndroidManifest.xml

(limited to 'client/activity-demo/Piztor/AndroidManifest.xml')

diff --git a/client/activity-demo/Piztor/AndroidManifest.xml b/client/activity-demo/Piztor/AndroidManifest.xml
new file mode 100644
index 0000000..9561604
--- /dev/null
+++ b/client/activity-demo/Piztor/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.piztor"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="9"
+        android:targetSdkVersion="17" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="com.example.piztor.MainActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.example.piztor.Running"
+            android:label="@string/title_activity_running" >
+        </activity>
+    </application>
+
+</manifest>
-- 
cgit v1.2.3


From 589d2b52b1135e876ee4c76dd2bf11c7a7cd973a Mon Sep 17 00:00:00 2001
From: Myth Yang <yangguangpkpk@gmail.com>
Date: Fri, 23 Aug 2013 20:17:23 +0800
Subject: idiot

---
 client/activity-demo/Piztor/AndroidManifest.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'client/activity-demo/Piztor/AndroidManifest.xml')

diff --git a/client/activity-demo/Piztor/AndroidManifest.xml b/client/activity-demo/Piztor/AndroidManifest.xml
index 9561604..10e170f 100644
--- a/client/activity-demo/Piztor/AndroidManifest.xml
+++ b/client/activity-demo/Piztor/AndroidManifest.xml
@@ -3,6 +3,12 @@
     package="com.example.piztor"
     android:versionCode="1"
     android:versionName="1.0" >
+    
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+	<uses-permission android:name="android.permission.WAKE_LOCK"/>
+	<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
 
     <uses-sdk
         android:minSdkVersion="9"
-- 
cgit v1.2.3