Snap for 8564071 from 2fafc7ad9c97dc5f78241bcdaf1e50d2975983f1 to mainline-wifi-release
Change-Id: Ib5ea8d761b0b9334a16b12c37dc7f440c0382e3f
diff --git a/Android.bp b/Android.bp
index e04b939..cb30f33 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,6 +1,22 @@
+package {
+ default_applicable_licenses: ["packages_apps_Browser2_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+ name: "packages_apps_Browser2_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-BSD",
+ ],
+ // large-scale-change unable to identify any license_text files
+}
+
android_app {
name: "Browser2",
sdk_version: "current",
srcs: ["src/**/*.java"],
+ uses_libs: ["android.test.runner"],
product_specific: true,
}
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2dbbe9d..930ef25 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -10,7 +10,7 @@
android:versionCode="1"
android:versionName="1.0" >
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
+ <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
<!-- "Normal" permissions which do not require user prompt -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/OWNERS b/OWNERS
index 452a499..c43c5d6 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,4 @@
timvolodine@google.com
-tobiasjs@google.com
+torne@google.com
rtenneti@google.com
diff --git a/README b/README
index 57d75d5..ec31115 100644
--- a/README
+++ b/README
@@ -1,4 +1,11 @@
Browser2 is a copy of the WebViewShell, a minimal test browser using WebView.
-The old Browser is no longer supported. To build a full-fledged browser for
-AOSP, please follow the instructions at:
+The old Browser is no longer supported.
+
+This is *not* a production quality browser and does not implement suitable
+security UI to be used for anything other than testing WebView. This should not
+be shipped in production devices, or used as the basis for implementing a real
+browser.
+
+To build a full-fledged browser for AOSP, one option is to build a standalone
+(non-WebView-based) Chromium browser by following the instructions at:
https://www.chromium.org/developers/how-tos/android-build-instructions
diff --git a/src/org/chromium/webview_shell/WebViewBrowserActivity.java b/src/org/chromium/webview_shell/WebViewBrowserActivity.java
index 0a7b637..cce295a 100644
--- a/src/org/chromium/webview_shell/WebViewBrowserActivity.java
+++ b/src/org/chromium/webview_shell/WebViewBrowserActivity.java
@@ -570,21 +570,17 @@
// but we still use it because we support api level 19 and up.
@SuppressWarnings("deprecation")
private void initializeSettings(WebSettings settings) {
- File appcache = null;
File geolocation = null;
StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
- appcache = getDir("appcache", 0);
geolocation = getDir("geolocation", 0);
StrictMode.setThreadPolicy(oldPolicy);
settings.setJavaScriptEnabled(true);
// configure local storage apis and their database paths.
- settings.setAppCachePath(appcache.getPath());
settings.setGeolocationDatabasePath(geolocation.getPath());
- settings.setAppCacheEnabled(true);
settings.setGeolocationEnabled(true);
settings.setDatabaseEnabled(true);
settings.setDomStorageEnabled(true);
