diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2023-11-06 09:38:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-11-06 09:38:55 +0000 |
| commit | e60c53b7dddde598ae1f77cd5cf96dd99d24ce08 (patch) | |
| tree | 3b2ec57a4e8a3eda751908289c5150e98a4b362f | |
| parent | 0086c9445d5fbb4d1c0acad0f5286c774e6e784b (diff) | |
| parent | c556a4f20603879f3b655423abfb5459fbbe325a (diff) | |
| download | CaptivePortalLogin-e60c53b7dddde598ae1f77cd5cf96dd99d24ce08.tar.gz | |
Merge "Bump CaptivePortalLogin target SDK to 34" into main
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | tests/Android.bp | 2 | ||||
| -rw-r--r-- | tests/AndroidManifest.xml | 2 |
4 files changed, 8 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" 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" /> |