Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1e7be37 authored Apr 22, 2016 by TreeHugger Robot Committed by Android (Google) Code Review Apr 22, 2016

Merge "Fixed NPE during boot animation on fugu." into nyc-dev

parents 5a91b615 20ec11b4

services/core/java/com/android/server/wm/DockedStackDividerController.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -538,12 +538,15 @@ public class DockedStackDividerController implements DimLayerUser {
		}

		public boolean animate(long now) {
		if (mWindow == null) {
		return false;
		}
		if (mAnimatingForMinimizedDockedStack) {
		return animateForMinimizedDockedStack(now);
		} else if (mAnimatingForIme) {
		return animateForIme(now);
		} else {
		if (mDimLayer != null) {
		if (mDimLayer != null && mDimLayer.isDimming()) {
		mDimLayer.setLayer(mService.mLayersController.getResizeDimLayer());
		}
		return false;

services/core/java/com/android/server/wm/WindowLayersController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
		import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYERS;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
		import static com.android.server.wm.WindowManagerService.LAYER_OFFSET_DIM;
		import static com.android.server.wm.WindowManagerService.WINDOW_LAYER_MULTIPLIER;

		/**
		@@ -150,7 +151,7 @@ public class WindowLayersController {
		* above all application surfaces.
		*/
		int getResizeDimLayer() {
		return mDockDivider.mLayer - 1;
		return (mDockDivider != null) ? mDockDivider.mLayer - 1 : LAYER_OFFSET_DIM;
		}

		private void logDebugLayers(WindowList windows) {