commit bf0982d01135d544e9057efbab66b95592823c3f
author Gustav Sennton <gsennton@google.com> Tue Mar 29 13:47:35 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 29 13:47:37 2016 +0000
tree 5da2e34eb2b796607160469461c32a66f9f466e4
parent 1a981d27e08c2b2800398c84890ac25a6e1cf9ef
parent 79f1216eb15a84f2d1f8ef2b57083eaf7a955bd4

Merge "Remove the system api method WebViewFactory.getWebViewPackageName" into nyc-dev

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 99a4ad3..eff0660 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -48672,7 +48672,6 @@
   public final class WebViewFactory {
     ctor public WebViewFactory();
     method public static android.content.pm.PackageInfo getLoadedPackageInfo();
-    method public static java.lang.String getWebViewPackageName();
     method public static int loadWebViewNativeLibraryFromPackage(java.lang.String, java.lang.ClassLoader);
     method public static void prepareWebViewInZygote();
     field public static final java.lang.String CHROMIUM_WEBVIEW_VMSIZE_SIZE_PROPERTY = "persist.sys.webview.vmsize";

core/java/android/webkit/WebViewFactory.java

diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java
index f1bf890..d884f19 100644
--- a/core/java/android/webkit/WebViewFactory.java
+++ b/core/java/android/webkit/WebViewFactory.java
@@ -128,11 +128,6 @@
         public MissingWebViewPackageException(Exception e) { super(e); }
     }
 
-    // TODO (gsennton) remove when committing webview xts test change
-    public static String getWebViewPackageName() {
-        return null;
-    }
-
     /**
      * @hide
      */