Snap for 11224086 from 976e3b92f1b782876057ac99501f5b497156a72f to mainline-tzdata5-release
Change-Id: Id911a23dbf6b710898f6c30357890695d0dc9353
diff --git a/Android.bp b/Android.bp
index b8f7892..0925b9e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,7 +23,7 @@
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/OWNERS b/OWNERS
index 62c5737..b0e134e 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,3 @@
+# Bug component: 31808
set noparent
-file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking
+file:platform/packages/modules/Connectivity:main:/OWNERS_core_networking
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index af8a34d..50a5d7c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -19,7 +19,7 @@
<string name="ssl_error_unknown" msgid="3751419329218834886">"Erro de certificado desconhecido."</string>
<string name="ssl_security_warning_title" msgid="7912335118289529802">"Aviso de segurança"</string>
<string name="ssl_error_view_certificate" msgid="3447891108083278449">"Ver certificado"</string>
- <string name="custom_scheme_warning" msgid="1809266150423969087">"A rede à qual pretende aceder está a solicitar a abertura de outra app."</string>
+ <string name="custom_scheme_warning" msgid="1809266150423969087">"A rede à qual quer aceder está a solicitar a abertura de outra app."</string>
<string name="custom_scheme_example" msgid="7126568152528588592">"Por exemplo, a página de início de sessão pode exigir uma app específica para autenticação."</string>
<string name="ok" msgid="6584612582120777209">"OK"</string>
<string name="page_info_address" msgid="1290683284404217554">"Endereço:"</string>
diff --git a/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index 64f7ce5..dad67c1 100755
--- a/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -939,14 +939,10 @@
" display:inline-block;",
" font-size:" + sp(14) + ";",
" font-weight:bold;",
- " height:48px;",
" margin-top:24px;",
" text-decoration:none;",
" text-transform:uppercase;",
" }",
- " a#cert_link {",
- " margin-top:0px;",
- " }",
" </style>",
"</head>",
"<body>",
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 @@
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" />
diff --git a/tests/src/com/android/captiveportallogin/RequestDismissKeyguardActivity.kt b/tests/src/com/android/captiveportallogin/RequestDismissKeyguardActivity.kt
index 8657e19..1636533 100644
--- a/tests/src/com/android/captiveportallogin/RequestDismissKeyguardActivity.kt
+++ b/tests/src/com/android/captiveportallogin/RequestDismissKeyguardActivity.kt
@@ -29,7 +29,7 @@
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setTurnScreenOn(true)
- getSystemService(KeyguardManager::class.java).requestDismissKeyguard(this, null)
+ getSystemService(KeyguardManager::class.java)!!.requestDismissKeyguard(this, null)
finish()
}
-}
\ No newline at end of file
+}
