Index: chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkValidator.java |
diff --git a/chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkValidator.java b/chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkValidator.java |
index 377494bdae5659ecf521421ede980fe4317abced..b1dd13fcf9e4b7151773cd5e2f3a2b41cc5ad3b2 100644 |
--- a/chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkValidator.java |
+++ b/chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkValidator.java |
@@ -4,8 +4,6 @@ |
package org.chromium.webapk.lib.client; |
-import static org.chromium.webapk.lib.common.WebApkConstants.WEBAPK_PACKAGE_PREFIX; |
- |
import android.content.Context; |
import android.content.Intent; |
import android.content.pm.PackageInfo; |
@@ -15,6 +13,8 @@ import android.content.pm.ResolveInfo; |
import android.content.pm.Signature; |
import android.util.Log; |
+import org.chromium.webapk.lib.common.WebApkConstants; |
Xi Han
2017/01/16 16:56:19
Is this change necessary?
gonzalon
2017/01/16 19:50:44
I could finally figure out what was happening. The
|
+ |
import java.util.Arrays; |
import java.util.List; |
@@ -69,7 +69,8 @@ public class WebApkValidator { |
public static String findWebApkPackage(Context context, List<ResolveInfo> infos) { |
for (ResolveInfo info : infos) { |
if (info.activityInfo != null |
- && info.activityInfo.packageName.startsWith(WEBAPK_PACKAGE_PREFIX) |
+ && info.activityInfo.packageName.startsWith( |
+ WebApkConstants.WEBAPK_PACKAGE_PREFIX) |
&& isValidWebApk(context, info.activityInfo.packageName)) { |
return info.activityInfo.packageName; |
} |
@@ -83,7 +84,7 @@ public class WebApkValidator { |
* @param webappPackageName The package name to check |
* @return true iff the WebAPK is installed and passes security checks |
*/ |
- private static boolean isValidWebApk(Context context, String webappPackageName) { |
+ public static boolean isValidWebApk(Context context, String webappPackageName) { |
if (sExpectedSignature == null) { |
Log.wtf(TAG, "WebApk validation failure - expected signature not set." |
+ "missing call to WebApkValidator.initWithBrowserHostSignature"); |