summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Edgar Arriaga <edgararriaga@google.com> 2024-01-12 23:40:50 +0000
committer Edgar Arriaga GarcĂ­a <edgararriaga@google.com> 2024-01-12 23:43:41 +0000
commitc1cb0730047326068b95172acd061fde31785cbb (patch)
tree3460fe12e0298e204120dbee55d7fe1757063251
parent7bac0f0a3d16f6af07b91c1e2f349a317c26b7b2 (diff)
Fix for NPE in webview test
Bug: 319221140 Test: atest WebViewUpdateServiceTest Change-Id: Ic1dfe8720064f32a2313a94aadc6956b2da7c820
-rw-r--r--services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java b/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java
index 60dc4ff224bc..d95b431752ec 100644
--- a/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java
+++ b/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java
@@ -348,6 +348,10 @@ class WebViewUpdateServiceImpl implements WebViewUpdateServiceInterface {
private void pinWebviewIfRequired(ApplicationInfo appInfo) {
PinnerService pinnerService = LocalServices.getService(PinnerService.class);
+ if (pinnerService == null) {
+ // This happens in unit tests which do not have services.
+ return;
+ }
int webviewPinQuota = pinnerService.getWebviewPinQuota();
if (webviewPinQuota <= 0) {
return;