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

Merge "Fix NPE in WallpaperDrawable" into nyc-dev

Browse Source 
am: 75db039

* commit '75db0392b89a7f83650f087227bcccda32833cfa':
  Fix NPE in WallpaperDrawable

Change-Id: I2ab5f237ec31fd81ce0b3ff544b481d604bb9f97
This commit is contained in:
Adrian Roos
2016-04-20 01:31:49 +00:00
committed by android-build-merger
parent 50e1291340 75db0392b8
commit c5d25509cb
2 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenWallpaper.java
View File

@@ -16,6 +16,7 @@
package com.android.systemui.statusbar.phone;
import android.annotation.Nullable;
import android.app.ActivityManager;
import android.app.IWallpaperManager;
import android.app.IWallpaperManagerCallback;
@@ -26,6 +27,7 @@ import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.DrawableWrapper;
import android.os.AsyncTask;
import android.os.Handler;
@@ -209,12 +211,16 @@ public class LockscreenWallpaper extends IWallpaperManagerCallback.Stub implemen
*/
public static class WallpaperDrawable extends DrawableWrapper {
private Bitmap mBackground;
private Rect mTmpRect = new Rect();
private final ConstantState mState;
private final Rect mTmpRect = new Rect();
public WallpaperDrawable(Resources r, Bitmap b) {
super(new BitmapDrawable(r, b));
mBackground = b;
this(r, new ConstantState(b));
}
private WallpaperDrawable(Resources r, ConstantState state) {
super(new BitmapDrawable(r, state.mBackground));
mState = state;
}
@Override
@@ -231,8 +237,8 @@ public class LockscreenWallpaper extends IWallpaperManagerCallback.Stub implemen
protected void onBoundsChange(Rect bounds) {
int vwidth = getBounds().width();
int vheight = getBounds().height();
int dwidth = mBackground.getWidth();
int dheight = mBackground.getHeight();
int dwidth = mState.mBackground.getWidth();
int dheight = mState.mBackground.getHeight();
float scale;
float dx = 0, dy = 0;
@@ -255,5 +261,35 @@ public class LockscreenWallpaper extends IWallpaperManagerCallback.Stub implemen
super.onBoundsChange(mTmpRect);
}
@Override
public ConstantState getConstantState() {
return mState;
}
static class ConstantState extends Drawable.ConstantState {
private final Bitmap mBackground;
ConstantState(Bitmap background) {
mBackground = background;
}
@Override
public Drawable newDrawable() {
return newDrawable(null);
}
@Override
public Drawable newDrawable(@Nullable Resources res) {
return new WallpaperDrawable(res, this);
}
@Override
public int getChangingConfigurations() {
// DrawableWrapper already handles this for us.
return 0;
}
}
}
}

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -2021,7 +2021,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
if (metaDataChanged) {
if (mBackdropBack.getDrawable() != null) {
Drawable drawable =
mBackdropBack.getDrawable().getConstantState().newDrawable().mutate();
mBackdropBack.getDrawable().getConstantState()
.newDrawable(mBackdropFront.getResources()).mutate();
mBackdropFront.setImageDrawable(drawable);
if (mScrimSrcModeEnabled) {
mBackdropFront.getDrawable().mutate().setXfermode(mSrcOverXferMode);