Themes: Use default_wallpaper for HOLO lockscreen wp (530d6a75) · Commits · e / os / android_frameworks_base

services/java/com/android/server/ThemeService.java

+18 −16

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import android.content.res.IThemeChangeListener;
		import android.content.res.IThemeService;
		import android.database.Cursor;
		import android.graphics.Bitmap;
		import android.graphics.BitmapFactory;
		import android.media.RingtoneManager;
		import android.net.Uri;
		import android.os.Binder;
		@@ -460,12 +461,7 @@ public class ThemeService extends IThemeService.Stub {

		private boolean updateLockscreen() {
		boolean success = false;
		if (HOLO_DEFAULT.equals(mPkgName)) {
		WallpaperManager.getInstance(mContext).clearKeyguardWallpaper();
		success = true;
		} else {
		success = setCustomLockScreenWallpaper();
		}

		if (success) {
		mContext.sendBroadcastAsUser(new Intent(Intent.ACTION_KEYGUARD_WALLPAPER_CHANGED),
		@@ -476,6 +472,11 @@ public class ThemeService extends IThemeService.Stub {

		private boolean setCustomLockScreenWallpaper() {
		try {
		if (HOLO_DEFAULT.equals(mPkgName)) {
		final Bitmap bmp = BitmapFactory.decodeResource(mContext.getResources(),
		com.android.internal.R.drawable.default_wallpaper);
		WallpaperManager.getInstance(mContext).setKeyguardBitmap(bmp);
		} else {
		//Get input WP stream from the theme
		Context themeCtx = mContext.createPackageContext(mPkgName, Context.CONTEXT_IGNORE_SECURITY);
		AssetManager assetManager = themeCtx.getAssets();
		@@ -487,6 +488,7 @@ public class ThemeService extends IThemeService.Stub {
		InputStream is = ThemeUtils.getInputStreamFromAsset(themeCtx, "file:///android_asset/" + wpPath);

		WallpaperManager.getInstance(mContext).setKeyguardStream(is);
		}
		} catch (Exception e) {
		Log.e(TAG, "There was an error setting lockscreen wp for pkg " + mPkgName, e);
		return false;