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

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 7032029..f6b25f5 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -169,6 +169,18 @@
     }
 
     @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions,
+                                           int[] grantResults) {
+        if (getController().getCurrentWebView() != null) {
+            if (getController().getCurrentWebView().onRequestPermissionsResult(
+                    requestCode, permissions, grantResults)) {
+                return;
+            }
+        }
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
+
+    @Override
     protected void onNewIntent(Intent intent) {
         if (shouldIgnoreIntents()) return;
         EngineInitializer.onNewIntent(BrowserActivity.this, intent);