diff options
| author | 2020-11-23 11:56:51 +0000 | |
|---|---|---|
| committer | 2020-11-23 11:56:51 +0000 | |
| commit | aedc4ae81c6045de4a2074c3feea960d5edb6835 (patch) | |
| tree | e65002f00013a2722cfcf59e560086ca8c5e872f | |
| parent | 2388cd528c290073a35df1c27afdc52fa12fbef2 (diff) | |
| parent | f47c1ebc10f1cc4398d4e71bf9fc5af511d81c8b (diff) | |
Merge "Give ACCESS_NETWORK_STATE permission to PacProcessor. Fix UnsupportedOperationException for PacProcessor#createInstance."
| -rw-r--r-- | core/java/android/webkit/PacProcessor.java | 2 | ||||
| -rw-r--r-- | packages/services/PacProcessor/AndroidManifest.xml | 1 |
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" |