commit a3d93b1aa56fdd91c3ff98e12aa0b55a174f3e3b
author Vivek Sekhar <vsekhar@codeaurora.org> Sat Nov 21 21:26:33 2015 -0800
committer jrizzoli <joey@cyanogenmoditalia.it> Thu Dec 03 19:57:02 2015 +0100
tree fb3814910c7e5b3c068bae04a8a0ed677d614e02
parent fb9c05fe2f0412680ec276947786785b1a9de37d

Support dangerous permission for Android M

Change-Id: I4e2b7dbc229afa52e9693630f95b9f4954f2def0

Conflicts:
	AndroidManifest.xml.jinja2

AndroidManifest.xml.jinja2

diff --git a/AndroidManifest.xml.jinja2 b/AndroidManifest.xml.jinja2
index a9fccd4..c605287 100644
--- a/AndroidManifest.xml.jinja2
+++ b/AndroidManifest.xml.jinja2
@@ -47,9 +47,7 @@
     <uses-permission android:name="{{ app_package_name }}.permission.WRITE_HOMEPAGE" />
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-
     <!-- Templatize taskAffinity otherwise it will default to 'package'
         defined in manifest -->
     <application   android:name="com.android.browser.Browser"
@@ -430,7 +428,8 @@
 
     </application>
 
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
+    <!-- CM 12.1+ -->
+    <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="23" />
 
     {{ extra_supports_gl_texture }}