Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8be59185 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch 'v1-t' into 'v2.5-t' 

Add october security patch

See merge request !220
parents 61689251 20b80289

res/values-ga-rIE/cm_strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java

+5 −0
Original line number Diff line number Diff line
@@ -293,6 +293,11 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
        }

    }



    @Override

    protected boolean shouldSkipForInitialSUW() {

        return true;

    }



    @Override

    public void onPause() {

        super.onPause();

tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java

+5 −0
Original line number Diff line number Diff line
@@ -895,4 +895,9 @@ public class AdvancedPowerUsageDetailTest { 


        verifyNoInteractions(mBackupManager);

    }



    @Test

    public void shouldSkipForInitialSUW_returnTrue() {

        assertThat(mFragment.shouldSkipForInitialSUW()).isTrue();

    }

}