Merge "Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am:... (e0593822) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/drawable/DrawableContainer.java

+35 −25

Original line number	Diff line number	Diff line
		@@ -500,6 +500,13 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
		* @param d The drawable to initialize.
		*/
		private void initializeDrawableForDisplay(Drawable d) {
		// Temporary fix for suspending callbacks during initialization. We
		// don't want any of these setters causing an invalidate() since that
		// may call back into DrawableContainer.
		final Callback cb = d.getCallback();
		d.setCallback(null);

		try {
		if (mDrawableContainerState.mEnterFadeDuration <= 0 && mHasAlpha) {
		d.setAlpha(mAlpha);
		}
		@@ -529,6 +536,9 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
		d.setHotspotBounds(hotspotBounds.left, hotspotBounds.top,
		hotspotBounds.right, hotspotBounds.bottom);
		}
		} finally {
		d.setCallback(cb);
		}
		}

		void animate(boolean schedule) {