diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-08 09:32:09 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-08 09:32:09 +0000 |
commit | 377565b37fc9c93facfae1db57c3853addd0a06e (patch) | |
tree | ac86cae41dd7943e302067e743e2a2ceba91a3c4 | |
parent | 41fa8a6b33d7a79a9ffb9bef72cf7ef0454a7368 (diff) | |
parent | 0cee8f7769d3953c23db83ce62603de03f76c2f3 (diff) | |
download | CaptivePortalLogin-android14-mainline-os-statsd-release.tar.gz |
Snap for 11068615 from 0cee8f7769d3953c23db83ce62603de03f76c2f3 to mainline-os-statsd-releaseaml_sta_341410000aml_sta_341311010android14-mainline-os-statsd-release
Change-Id: I1805447fb8058de4d48d771ec9ec991ce23f2826
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | AndroidManifest.xml | 6 | ||||
-rw-r--r-- | OWNERS | 1 | ||||
-rw-r--r-- | tests/Android.bp | 2 | ||||
-rw-r--r-- | tests/AndroidManifest.xml | 2 |
5 files changed, 9 insertions, 4 deletions
@@ -23,7 +23,7 @@ java_defaults { srcs: ["src/**/*.java"], sdk_version: "system_current", min_sdk_version: "30", - target_sdk_version: "33", // Keep in sync with CaptivePortalLoginTests + target_sdk_version: "34", // Keep in sync with CaptivePortalLoginTests static_libs: [ "androidx.annotation_annotation", "androidx.legacy_legacy-support-core-ui", diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 18759dd..b04519c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -31,6 +31,7 @@ <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" /> <uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> + <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" /> <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/> <!-- The login activity can start downloads, and in cases where the download is an APK, @@ -60,7 +61,10 @@ <category android:name="android.intent.category.DEFAULT"/> </intent-filter> </activity> - <service android:name=".DownloadService" android:exported="false" /> + <!-- TODO(b/309362084): use a "data-initiated data transfer job" instead of a foreground + service for downloads --> + <service android:name=".DownloadService" android:exported="false" + android:foregroundServiceType="dataSync" /> <provider android:name="androidx.core.content.FileProvider" android:authorities="com.android.captiveportallogin.fileprovider" @@ -1,2 +1,3 @@ +# Bug component: 31808 set noparent file:platform/packages/modules/Connectivity:main:/OWNERS_core_networking diff --git a/tests/Android.bp b/tests/Android.bp index fd14436..179c65f 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -27,7 +27,7 @@ android_test { platform_apis: true, compile_multilib: "both", min_sdk_version: "30", - target_sdk_version: "33", // Keep in sync with CaptivePortalLogin + target_sdk_version: "34", // Keep in sync with CaptivePortalLogin test_suites: ["general-tests", "mts-networking"], test_config: "AndroidTest.xml", diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index 6fbe419..308335c 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -42,7 +42,7 @@ android:name="com.android.captiveportallogin.CaptivePortalLoginActivityTest$InstrumentedCaptivePortalLoginActivity"/> <activity android:name="com.android.captiveportallogin.DownloadServiceTest$RequestDismissKeyguardActivity"/> <activity android:name="com.android.captiveportallogin.DownloadServiceTest$OpenTextFileActivity" - android:exported="false" > + android:exported="true" > <intent-filter> <action android:name="android.intent.action.VIEW" /> <category android:name="android.intent.category.DEFAULT" /> |