summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anna Malova <amalova@google.com> 2020-11-05 13:03:38 +0000
committer Anna Malova <amalova@google.com> 2020-11-23 11:56:20 +0000
commitf47c1ebc10f1cc4398d4e71bf9fc5af511d81c8b (patch)
tree18ce3a90c0af14e878d7c3ca142ced3511f3edb6
parent23590bacd0cfd5521c5211d64571c6f17342fafe (diff)
Give ACCESS_NETWORK_STATE permission to PacProcessor.
Fix UnsupportedOperationException for PacProcessor#createInstance. Bug: 169844605 Bug: 171733851 Test: n/a Change-Id: Ied19cc296c945c8923ffa65452113a87a13e7a25
-rw-r--r--core/java/android/webkit/PacProcessor.java2
-rw-r--r--packages/services/PacProcessor/AndroidManifest.xml1
2 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/webkit/PacProcessor.java b/core/java/android/webkit/PacProcessor.java
index d7b4e8bba884..21fa6fc88c13 100644
--- a/core/java/android/webkit/PacProcessor.java
+++ b/core/java/android/webkit/PacProcessor.java
@@ -54,7 +54,7 @@ public interface PacProcessor {
*/
@NonNull
static PacProcessor createInstance() {
- throw new UnsupportedOperationException("Not implemented");
+ return WebViewFactory.getProvider().createPacProcessor();
}
/**
diff --git a/packages/services/PacProcessor/AndroidManifest.xml b/packages/services/PacProcessor/AndroidManifest.xml
index ad1326194a4d..533098cbdc75 100644
--- a/packages/services/PacProcessor/AndroidManifest.xml
+++ b/packages/services/PacProcessor/AndroidManifest.xml
@@ -3,6 +3,7 @@
package="com.android.pacprocessor">
<uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application
android:label="@string/app_name"