From f47c1ebc10f1cc4398d4e71bf9fc5af511d81c8b Mon Sep 17 00:00:00 2001
From: Anna Malova <amalova@google.com>
Date: Thu, 5 Nov 2020 13:03:38 +0000
Subject: [PATCH] Give ACCESS_NETWORK_STATE permission to PacProcessor. Fix
 UnsupportedOperationException for PacProcessor#createInstance.

Bug: 169844605
Bug: 171733851
Test: n/a

Change-Id: Ied19cc296c945c8923ffa65452113a87a13e7a25
---
 core/java/android/webkit/PacProcessor.java         | 2 +-
 packages/services/PacProcessor/AndroidManifest.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/webkit/PacProcessor.java b/core/java/android/webkit/PacProcessor.java
index d7b4e8bba8840..21fa6fc88c13c 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 ad1326194a4d3..533098cbdc752 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"