From 94d43e6253ecc8f5121e86f8ed14f46e9f1054d5 Mon Sep 17 00:00:00 2001
From: maning <ning.ma@12301.cn>
Date: Thu, 28 Jul 2016 11:44:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml          | 6 +++++-
 libraryzxing/src/main/AndroidManifest.xml | 7 -------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9aa7f86..884f543 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.maning.zxingcodedemo">
 
+    <!--权限添加-->
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.FLASHLIGHT" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -15,7 +19,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".HistoryActivity"></activity>
+        <activity android:name=".HistoryActivity"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/libraryzxing/src/main/AndroidManifest.xml b/libraryzxing/src/main/AndroidManifest.xml
index 6d4ef4c..1a4e324 100644
--- a/libraryzxing/src/main/AndroidManifest.xml
+++ b/libraryzxing/src/main/AndroidManifest.xml
@@ -4,13 +4,6 @@
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
 
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.FLASHLIGHT" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <!-- 闪光灯 -->
-    <uses-permission android:name="android.permission.FLASHLIGHT" />
-
     <application
         android:allowBackup="true"
         android:label="@string/app_name"