Bump CaptivePortalLogin target SDK to 35.
Make CaptivePortalLogin module be up-to-date with latest SDK. New SDK
version has changes on the system UI e.g. edge-to-edge enforcement,
which affects the portal WebView StatusBar display. According to the
suggestion listed in below link, add `android:fitsSystemWindows="true"`
in activity_captive_portal_login.xml to fix the StatusBar overlap.
behavior changes for SDK 35:
https://developer.android.com/about/versions/15/behavior-changes-15
Bug: 344652257
Test: atest CaptivePortalLoginTests
Test: manual test to verify that device can redirect to the portal page
correctly, click the download button and SSL error link, both
works as expected.
Test: manual test to verify connecting to wifi and functioned as a
hotspot, the downstream devices can connect to network normally.
Test: build an app in android-studio, and add below property in the
Manifest.xml, verify the captive portal notification while opening
the app, the device can connect to the network normally and the
download service also works.
android:allowCrossUidActivitySwitchFromBelow="false"
Test: manual test to connect to captive portal AP and verify the WebView
page looks normally and works as expected.
Change-Id: Ia43d05026e40e586ef24ae8f39fb800eee8524ef
diff --git a/Android.bp b/Android.bp
index c8e2020..8b66e37 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,7 +24,7 @@
srcs: ["src/**/*.java"],
sdk_version: "module_current",
min_sdk_version: "30",
- target_sdk_version: "34", // Keep in sync with CaptivePortalLoginTests
+ target_sdk_version: "35", // Keep in sync with CaptivePortalLoginTests
static_libs: [
"androidx.annotation_annotation",
"androidx.legacy_legacy-support-core-ui",
diff --git a/res/layout/activity_captive_portal_login.xml b/res/layout/activity_captive_portal_login.xml
index d61cca5..9d9ccb9 100644
--- a/res/layout/activity_captive_portal_login.xml
+++ b/res/layout/activity_captive_portal_login.xml
@@ -3,6 +3,7 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:fitsSystemWindows="true"
tools:context="com.android.captiveportallogin.CaptivePortalLoginActivity"
tools:ignore="MergeRootFrame" >
diff --git a/tests/Android.bp b/tests/Android.bp
index 4dfc7dd..f8195a1 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -31,7 +31,7 @@
platform_apis: true,
compile_multilib: "both",
min_sdk_version: "30",
- target_sdk_version: "34", // Keep in sync with CaptivePortalLogin
+ target_sdk_version: "35", // Keep in sync with CaptivePortalLogin
test_suites: [
"general-tests",
"mts-networking",
