From 963dbbbdb616646240dde9a4b2b7b7592ddfefaa Mon Sep 17 00:00:00 2001 From: Gustav Sennton Date: Thu, 6 Apr 2017 16:18:02 +0100 Subject: [PATCH] Remove WebView-fallback code for handling the non-functional stub. We have already removed the non-functional WebView stub, so we can now remove the logic ensuring that a primary device user could use any valid WebView package even when a secondary user did not have any WebView package to choose from (since all device users should always have a valid package to use as WebView implementation). Bug: 34730873 Test: run WebViewUpdateServiceTest tests. Test: Create new user, disable Chrome for that user, ensure WebView loads for that user and for the primary user. Change-Id: Ia77cc2efd9e40a157fb5b68a988425ef15508033 --- .../com/android/server/webkit/WebViewUpdater.java | 9 --------- .../server/webkit/WebViewUpdateServiceTest.java | 13 +++++-------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/services/core/java/com/android/server/webkit/WebViewUpdater.java b/services/core/java/com/android/server/webkit/WebViewUpdater.java index 56311a3675772..37479c89fd357 100644 --- a/services/core/java/com/android/server/webkit/WebViewUpdater.java +++ b/services/core/java/com/android/server/webkit/WebViewUpdater.java @@ -315,15 +315,6 @@ class WebViewUpdater { } } - // Could not find any installed and enabled package either, use the most stable and - // default-available provider. - // TODO(gsennton) remove this when we have a functional WebView stub. - for (ProviderAndPackageInfo providerAndPackage : providers) { - if (providerAndPackage.provider.availableByDefault) { - return providerAndPackage.packageInfo; - } - } - // This should never happen during normal operation (only with modified system images). mAnyWebViewInstalled = false; throw new WebViewPackageMissingException("Could not find a loadable WebView package"); diff --git a/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java b/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java index 925f41490e4cd..9c8007a9d4894 100644 --- a/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java @@ -1219,14 +1219,11 @@ public class WebViewUpdateServiceTest { runWebViewBootPreparationOnMainSync(); - checkPreparationPhasesForPackage(testPackageName, 1 /* first preparation phase */); - // TODO(gsennton) change this logic to use the code below when we have created a functional - // stub. - //Mockito.verify(mTestSystemImpl, Mockito.never()).onWebViewProviderChanged( - // Matchers.anyObject()); - //WebViewProviderResponse response = mWebViewUpdateServiceImpl.waitForAndGetProvider(); - //assertEquals(WebViewFactory.LIBLOAD_FAILED_LISTING_WEBVIEW_PACKAGES, response.status); - //assertEquals(null, mWebViewUpdateServiceImpl.getCurrentWebViewPackage()); + Mockito.verify(mTestSystemImpl, Mockito.never()).onWebViewProviderChanged( + Matchers.anyObject()); + WebViewProviderResponse response = mWebViewUpdateServiceImpl.waitForAndGetProvider(); + assertEquals(WebViewFactory.LIBLOAD_FAILED_LISTING_WEBVIEW_PACKAGES, response.status); + assertEquals(null, mWebViewUpdateServiceImpl.getCurrentWebViewPackage()); } @Test