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

Commit 79cc46d1 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android Git Automerger
Browse files

am fb85bc66: Merge "Add missing wallpaper service lock." into gingerbread 

Merge commit 'fb85bc66' into gingerbread-plus-aosp

* commit 'fb85bc66':
  Add missing wallpaper service lock.
parents 282315e1 fb85bc66

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

+6 −2
Original line number Diff line number Diff line
@@ -727,6 +727,7 @@ class WallpaperManagerService extends IWallpaperManager.Stub { 
        }

    }



    // Called by SystemBackupAgent after files are restored to disk.

    void settingsRestored() {

        if (DEBUG) Slog.v(TAG, "settingsRestored");
@@ -766,8 +767,11 @@ class WallpaperManagerService extends IWallpaperManager.Stub { 
            mName = "";

            WALLPAPER_FILE.delete();

        }



        synchronized (mLock) {

            saveSettingsLocked();

        }

    }



    boolean restoreNamedResourceLocked() {

        if (mName.length() > 4 && "res:".equals(mName.substring(0, 4))) {