commit d7e5d09a9e04a8702f3d38a2e807226c8958321c
author Gustav Sennton <gsennton@google.com> Tue Nov 21 12:00:00 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 21 12:00:00 2017 +0000
tree af40f91fd31b1392e0c1f36bc8812e307af3b956
parent 77bfa66d130985b99817672678d47bb3d6f41f81
parent e5468f7554a05d147214c9fcd2cfdf77eec5ca12

Merge "Fix WebViewUpdateService test expectation to match reality."

core/java/android/webkit/UserPackage.java

diff --git a/core/java/android/webkit/UserPackage.java b/core/java/android/webkit/UserPackage.java
index 4cf3461..63519a6 100644
--- a/core/java/android/webkit/UserPackage.java
+++ b/core/java/android/webkit/UserPackage.java
@@ -34,6 +34,8 @@
     private final UserInfo mUserInfo;
     private final PackageInfo mPackageInfo;
 
+    public static final int MINIMUM_SUPPORTED_SDK = Build.VERSION_CODES.O_MR1;
+
     public UserPackage(UserInfo user, PackageInfo packageInfo) {
         this.mUserInfo = user;
         this.mPackageInfo = packageInfo;
@@ -83,7 +85,7 @@
      * supported by the current framework version.
      */
     public static boolean hasCorrectTargetSdkVersion(PackageInfo packageInfo) {
-        return packageInfo.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.O_MR1;
+        return packageInfo.applicationInfo.targetSdkVersion >= MINIMUM_SUPPORTED_SDK;
     }
 
     public UserInfo getUserInfo() {

services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java

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 05c4853..2224de5 100644
--- a/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java
@@ -31,6 +31,7 @@
 import android.support.test.runner.AndroidJUnit4;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Base64;
+import android.webkit.UserPackage;
 import android.webkit.WebViewFactory;
 import android.webkit.WebViewProviderInfo;
 import android.webkit.WebViewProviderResponse;
@@ -1628,10 +1629,10 @@
         newSdkPackage.applicationInfo.targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT;
         PackageInfo currentSdkPackage = createPackageInfo("currentTargetSdkPackage",
             true /* enabled */, true /* valid */, true /* installed */);
-        currentSdkPackage.applicationInfo.targetSdkVersion = Build.VERSION_CODES.N_MR1+1;
+        currentSdkPackage.applicationInfo.targetSdkVersion = UserPackage.MINIMUM_SUPPORTED_SDK;
         PackageInfo oldSdkPackage = createPackageInfo("oldTargetSdkPackage",
             true /* enabled */, true /* valid */, true /* installed */);
-        oldSdkPackage.applicationInfo.targetSdkVersion = Build.VERSION_CODES.N_MR1;
+        oldSdkPackage.applicationInfo.targetSdkVersion = UserPackage.MINIMUM_SUPPORTED_SDK - 1;
 
         WebViewProviderInfo newSdkProviderInfo =
                 new WebViewProviderInfo(newSdkPackage.packageName, "", true, false, null);