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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-04-22 21:23:52 +00:00
committed by Android (Google) Code Review
parent 5a91b61523 20ec11b4e6
commit a1e7be375e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/DockedStackDividerController.java
View File

@@ -538,12 +538,15 @@ public class DockedStackDividerController implements DimLayerUser {
} }
public boolean animate(long now) { public boolean animate(long now) {
if (mWindow == null) {
return false;
}
if (mAnimatingForMinimizedDockedStack) { if (mAnimatingForMinimizedDockedStack) {
return animateForMinimizedDockedStack(now); return animateForMinimizedDockedStack(now);
} else if (mAnimatingForIme) { } else if (mAnimatingForIme) {
return animateForIme(now); return animateForIme(now);
} else { } else {
if (mDimLayer != null) { if (mDimLayer != null && mDimLayer.isDimming()) {
mDimLayer.setLayer(mService.mLayersController.getResizeDimLayer()); mDimLayer.setLayer(mService.mLayersController.getResizeDimLayer());
} }
return false; return false;

3
services/core/java/com/android/server/wm/WindowLayersController.java
View File

@@ -27,6 +27,7 @@ import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER; 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.DEBUG_LAYERS;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; 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; import static com.android.server.wm.WindowManagerService.WINDOW_LAYER_MULTIPLIER;
/** /**
@@ -150,7 +151,7 @@ public class WindowLayersController {
* above all application surfaces. * above all application surfaces.
*/ */
int getResizeDimLayer() { int getResizeDimLayer() {
return mDockDivider.mLayer - 1; return (mDockDivider != null) ? mDockDivider.mLayer - 1 : LAYER_OFFSET_DIM;
} }
private void logDebugLayers(WindowList windows) { private void logDebugLayers(WindowList windows) {