From 2ba0d37c7ced48b5613cee8b7c60dc091ad67fe0 Mon Sep 17 00:00:00 2001
From: Yiling Chuang <emilychuang@google.com>
Date: Mon, 8 Jul 2024 03:09:50 +0000
Subject: [PATCH 1/2] RESTRICT AUTOMERGE FRP bypass defense in App battery
 usage page

Before the setup flow completion, don't allow the app info page in App battery usage to be launched.

Bug: 327748846
Test: atest SettingsRoboTests + manual test
- factory reset + launch app battery usage app info via ADB during Setup -> verify app closes
Flag : EXEMPT bugfix

(cherry picked from commit 419a6a907902a12a0f565c808fa70092004d6686)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e5d21702863284479af7561e3c833bc2cab2a7d3)
Merged-In: I486820ca2afecc02729a56a3c531fb931c1907d0
Change-Id: I486820ca2afecc02729a56a3c531fb931c1907d0
---
 .../android/settings/fuelgauge/AdvancedPowerUsageDetail.java | 5 +++++
 .../settings/fuelgauge/AdvancedPowerUsageDetailTest.java     | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index 48825c8204a..21ab2a7bc45 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -284,6 +284,11 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
         }
     }
 
+    @Override
+    protected boolean shouldSkipForInitialSUW() {
+        return true;
+    }
+
     @Override
     public void onPause() {
         super.onPause();
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 269c810f852..977c05e16d0 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -894,4 +894,9 @@ public class AdvancedPowerUsageDetailTest {
 
         verifyZeroInteractions(mBackupManager);
     }
+
+    @Test
+    public void shouldSkipForInitialSUW_returnTrue() {
+        assertThat(mFragment.shouldSkipForInitialSUW()).isTrue();
+    }
 }
-- 
GitLab


From 6eeb7082ba8fad775706a58711c0de881e284163 Mon Sep 17 00:00:00 2001
From: LineageOS Infra <infra@lineageos.org>
Date: Tue, 15 Oct 2024 20:53:51 +0000
Subject: [PATCH 2/2] Automatic translation import

Change-Id: I5d26cda93666b2f453ed215546223bb979829378
---
 res/values-ga-rIE/cm_strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/values-ga-rIE/cm_strings.xml b/res/values-ga-rIE/cm_strings.xml
index 60fc907c346..02d37521361 100644
--- a/res/values-ga-rIE/cm_strings.xml
+++ b/res/values-ga-rIE/cm_strings.xml
@@ -16,5 +16,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="heads_up_notifications_enabled_title">Cinnirí suas</string>
+    <string name="heads_up_notifications_enabled_summary">Taispeáin fógraí tosaíochta i bhfuinneog bheag ar snámh</string>
     <string name="app_notification_sound_timeout_value_15_minutes">15 nóiméad</string>
+    <string name="assisted_gps_summary">Íoslódáil sonraí cúnaimh satailíte ón idirlíon ar féidir leo feidhmíocht tosaithe GPS a fheabhsú go mór. I gcás glaonna éigeandála, ceadaítear GPS cuidithe i gcónaí.</string>
 </resources>
-- 
GitLab