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

Commit c4762ee5 authored by Flavio Fiszman's avatar Flavio Fiszman Committed by Automerger Merge Worker
Browse files

Merge "Increase People Tile restore timeout to 48h" into sc-dev am: 457feb05 am: e17056d8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15173052

Change-Id: I7e4f69c3f2bccb475d09605a9a04bc3fd5914277
parents f65da0d2 e17056d8

packages/SystemUI/src/com/android/systemui/people/PeopleBackupFollowUpJob.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class PeopleBackupFollowUpJob extends JobService { 
    public static final int JOB_ID = 74823873;



    private static final long JOB_PERIODIC_DURATION = Duration.ofHours(6).toMillis();

    private static final long CLEAN_UP_STORAGE_AFTER_DURATION = Duration.ofHours(24).toMillis();

    private static final long CLEAN_UP_STORAGE_AFTER_DURATION = Duration.ofHours(48).toMillis();



    /** SharedPreferences file name for follow-up specific storage.*/

    public static final String SHARED_FOLLOW_UP = "shared_follow_up";

packages/SystemUI/tests/src/com/android/systemui/people/PeopleBackupFollowUpJobTest.java

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public class PeopleBackupFollowUpJobTest extends SysuiTestCase { 
    @Test

    public void testShouldCancelJob_noRemainingWidgets_longTimeElapsed_shouldCancel() {

        assertThat(mPeopleBackupFollowUpJob.shouldCancelJob(

                new HashMap<>(), 10, Duration.ofHours(25).toMillis())).isTrue();

                new HashMap<>(), 10, Duration.ofHours(50).toMillis())).isTrue();

    }



    @Test
@@ -171,7 +171,7 @@ public class PeopleBackupFollowUpJobTest extends SysuiTestCase { 
        Map<String, Set<String>> remainingWidgets = new HashMap<>();

        remainingWidgets.put(PEOPLE_TILE_KEY.toString(), WIDGET_IDS);

        assertThat(mPeopleBackupFollowUpJob.shouldCancelJob(

                remainingWidgets, 10, 1000 * 60 * 60 * 25)).isTrue();

                remainingWidgets, 10, Duration.ofHours(50).toMillis())).isTrue();

    }



    @Test