X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=AndroidManifest.xml;h=df4a0c1f491f093844bda41538c4f1ed827577b8;hb=c45aaf531cfd4f17457bb8cbbaf1ca31fbf08344;hp=b8816a616603d4673995563a63db780ff8db726a;hpb=34663b0fd4a21a6c107c6df313bcbd1548235fd5;p=android-x86%2Fpackages-apps-Camera2.git

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b8816a616..df4a0c1f4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="19"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -15,9 +15,7 @@
     <uses-permission android:name="android.permission.BIND_WALLPAPER" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -46,7 +44,8 @@
         android:largeHeap="true"
         android:restoreAnyVersion="true"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Camera" >
+        android:theme="@style/Theme.Camera"
+        android:usesCleartextTraffic="false" >
         <activity
             android:name="com.android.camera.CameraActivity"
             android:clearTaskOnLaunch="true"
@@ -73,6 +72,7 @@
         <activity
                 android:name="com.android.camera.PermissionsActivity"
                 android:label="@string/app_name"
+                android:excludeFromRecents="true"
                 android:parentActivityName="com.android.camera.CameraActivity" >
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"