Merge changes Ib28636e6,I93ebc433

* changes:
  WallpaperManagerService does not properly propagate setDimensionHints()
  ImageWallpaper : get bitmap width before calc screen offset

Author: Jean-Baptiste Queru

packages/SystemUI/src/com/android/systemui/ImageWallpaper.java

@@ -282,6 +282,13 @@ void drawFrameLocked() {
                 updateWallpaperLocked();
             }
 
+            if (mBackground == null) {
+                // If we somehow got to this point after we have last flushed
+                // the wallpaper, well we really need it to draw again.  So
+                // seems like we need to reload it.  Ouch.
+                updateWallpaperLocked();
+            }
+
             SurfaceHolder sh = getSurfaceHolder();
             final Rect frame = sh.getSurfaceFrame();
             final int dw = frame.width();
@@ -303,13 +310,6 @@ void drawFrameLocked() {
             mLastXTranslation = xPixels;
             mLastYTranslation = yPixels;
 
-            if (mBackground == null) {
-                // If we somehow got to this point after we have last flushed
-                // the wallpaper, well we really need it to draw again.  So
-                // seems like we need to reload it.  Ouch.
-                updateWallpaperLocked();
-            }
-
             if (mIsHwAccelerated) {
                 if (!drawWallpaperWithOpenGL(sh, availw, availh, xPixels, yPixels)) {
                     drawWallpaperWithCanvas(sh, availw, availh, xPixels, yPixels);

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

@@ -169,6 +169,7 @@ public void onEvent(int event, String path) {
     WallpaperConnection mWallpaperConnection;
     long mLastDiedTime;
     boolean mWallpaperUpdating;
+    boolean mDesiredDimensionChanging;
 
     class WallpaperConnection extends IWallpaperConnection.Stub
             implements ServiceConnection {
@@ -213,6 +214,13 @@ public void onServiceDisconnected(ComponentName name) {
 
         public void attachEngine(IWallpaperEngine engine) {
             mEngine = engine;
+             if (engine != null && mDesiredDimensionChanging) {
+                 try {
+                     engine.setDesiredSize(mWidth, mHeight);
+                     mDesiredDimensionChanging = false;
+                 } catch (RemoteException e) {
+                 }
+             }
         }
 
         public ParcelFileDescriptor setWallpaper(String name) {
@@ -395,6 +403,7 @@ public void setDimensionHints(int width, int height) throws RemoteException {
 
         synchronized (mLock) {
             if (width != mWidth || height != mHeight) {
+                boolean desiredDimensionPropagated = false;
                 mWidth = width;
                 mHeight = height;
                 saveSettingsLocked();
@@ -403,11 +412,15 @@ public void setDimensionHints(int width, int height) throws RemoteException {
                         try {
                             mWallpaperConnection.mEngine.setDesiredSize(
                                     width, height);
+                            desiredDimensionPropagated = true;
                         } catch (RemoteException e) {
                         }
                         notifyCallbacksLocked();
                     }
                 }
+                if (!desiredDimensionPropagated) {
+                    mDesiredDimensionChanging = true;
+                }
             }
         }
     }