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

Commit 541859d8 authored by Aurélien Pomini's avatar Aurélien Pomini
Browse files

Remove lockscreen lwp flag: followup 

No logic changes, just a few nits.

Bug: 273443374
Test: treehugger
Change-Id: I6160f07067e72f499899646ab39cd6d3585e0aa5
parent 2679eac0

packages/WallpaperBackup/test/src/com/android/wallpaperbackup/WallpaperBackupAgentTest.java

+3 −3
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ public class WallpaperBackupAgentTest { 
    }



    @Test

    public void testUpdateWallpaperComponent_doesApplyLater() throws IOException {

    public void testUpdateWallpaperComponent_systemAndLock() throws IOException {

        mWallpaperBackupAgent.mIsDeviceInRestore = true;

        mWallpaperBackupAgent.updateWallpaperComponent(mWallpaperComponent,

                /* which */ FLAG_LOCK | FLAG_SYSTEM);
@@ -377,7 +377,7 @@ public class WallpaperBackupAgentTest { 
    }



    @Test

    public void testUpdateWallpaperComponent_applyToLockFalse_doesApplyLaterOnlyToMainScreen()

    public void testUpdateWallpaperComponent_systemOnly()

            throws IOException {

        mWallpaperBackupAgent.mIsDeviceInRestore = true;
@@ -617,7 +617,7 @@ public class WallpaperBackupAgentTest { 


        mWallpaperBackupAgent.onRestoreFinished();



        // wallpaper will be applied to home & lock screen, a success for both screens in expected

        // wallpaper will be applied to home & lock screen, a success for both screens is expected

        DataTypeResult result = getLoggingResult(WALLPAPER_IMG_SYSTEM,

                mWallpaperBackupAgent.getBackupRestoreEventLogger().getLoggingResults());

        assertThat(result).isNotNull();

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -869,8 +869,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                if (!mWallpaper.wallpaperUpdating && mWallpaper.userId == mCurrentUserId) {

                    Slog.w(TAG, "Wallpaper reconnect timed out for " + mWallpaper.wallpaperComponent

                            + ", reverting to built-in wallpaper!");

                    int which = mWallpaper.mWhich;

                    clearWallpaperLocked(which, mWallpaper.userId, false, null);

                    clearWallpaperLocked(mWallpaper.mWhich, mWallpaper.userId, false, null);

                }

            }

        };