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

am cf5b34b0: Merge "Ensure WallpaperEngine has correct size information" into klp-dev

Browse Source 
* commit 'cf5b34b0c43df076cfe8b774c1c919303793fa7c':
  Ensure WallpaperEngine has correct size information
This commit is contained in:
Michael Wright
2013-10-03 14:53:51 -07:00
committed by Android Git Automerger
parent 63c375d325 cf5b34b0c4
commit 448a1f6fed
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/java/com/android/server/WallpaperManagerService.java
View File

@@ -219,6 +219,8 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
WallpaperData mWallpaper;
IRemoteCallback mReply;
boolean mDimensionsChanged = false;
public WallpaperConnection(WallpaperInfo info, WallpaperData wallpaper) {
mInfo = info;
mWallpaper = wallpaper;
@@ -262,6 +264,14 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
public void attachEngine(IWallpaperEngine engine) {
synchronized (mLock) {
mEngine = engine;
if (mDimensionsChanged) {
try {
mEngine.setDesiredSize(mWallpaper.width, mWallpaper.height);
} catch (RemoteException e) {
Slog.w(TAG, "Failed to set wallpaper dimensions", e);
}
mDimensionsChanged = false;
}
}
}
@@ -652,6 +662,11 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
} catch (RemoteException e) {
}
notifyCallbacksLocked(wallpaper);
} else if (wallpaper.connection.mService != null) {
// We've attached to the service but the engine hasn't attached back to us
// yet. This means it will be created with the previous dimensions, so we
// need to update it to the new dimensions once it attaches.
wallpaper.connection.mDimensionsChanged = true;
}
}
}