Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed a bug where the current wallpaper could be reset on an update"

Browse Source
This commit is contained in:
Selim Cinek
2014-03-10 16:07:10 +00:00
committed by Android (Google) Code Review
parent fc558d56c2 ebebadb56d
commit eb7bd8bbc3
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -230,7 +230,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
public void onServiceConnected(ComponentName name, IBinder service) { public void onServiceConnected(ComponentName name, IBinder service) {
synchronized (mLock) { synchronized (mLock) {
if (mWallpaper.connection == this) { if (mWallpaper.connection == this) {
mWallpaper.lastDiedTime = SystemClock.uptimeMillis();
mService = IWallpaperService.Stub.asInterface(service); mService = IWallpaperService.Stub.asInterface(service);
attachServiceLocked(this, mWallpaper); attachServiceLocked(this, mWallpaper);
// XXX should probably do saveSettingsLocked() later // XXX should probably do saveSettingsLocked() later
@@ -250,11 +249,21 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
if (mWallpaper.connection == this) { if (mWallpaper.connection == this) {
Slog.w(TAG, "Wallpaper service gone: " + mWallpaper.wallpaperComponent); Slog.w(TAG, "Wallpaper service gone: " + mWallpaper.wallpaperComponent);
if (!mWallpaper.wallpaperUpdating if (!mWallpaper.wallpaperUpdating
&& (mWallpaper.lastDiedTime + MIN_WALLPAPER_CRASH_TIME)
> SystemClock.uptimeMillis()
&& mWallpaper.userId == mCurrentUserId) { && mWallpaper.userId == mCurrentUserId) {
// There is a race condition which causes
// {@link #mWallpaper.wallpaperUpdating} to be false even if it is
// currently updating since the broadcast notifying us is async.
// This race is overcome by the general rule that we only reset the
// wallpaper if its service was shut down twice
// during {@link #MIN_WALLPAPER_CRASH_TIME} millis.
if (mWallpaper.lastDiedTime != 0
&& mWallpaper.lastDiedTime + MIN_WALLPAPER_CRASH_TIME
> SystemClock.uptimeMillis()) {
Slog.w(TAG, "Reverting to built-in wallpaper!"); Slog.w(TAG, "Reverting to built-in wallpaper!");
clearWallpaperLocked(true, mWallpaper.userId, null); clearWallpaperLocked(true, mWallpaper.userId, null);
} else {
mWallpaper.lastDiedTime = SystemClock.uptimeMillis();
}
} }
} }
} }
@@ -938,7 +947,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
} }
wallpaper.wallpaperComponent = componentName; wallpaper.wallpaperComponent = componentName;
wallpaper.connection = newConn; wallpaper.connection = newConn;
wallpaper.lastDiedTime = SystemClock.uptimeMillis();
newConn.mReply = reply; newConn.mReply = reply;
try { try {
if (wallpaper.userId == mCurrentUserId) { if (wallpaper.userId == mCurrentUserId) {