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

Merge "Fix NPE when WindowManagerDebugConfig.DEBUG_SCREENSHOT is true" into nyc-dev

Browse Source 
am: cc3cb5a

* commit 'cc3cb5a009bd0fb7c56ce3731a5ba8b3c95db772':
  Fix NPE when WindowManagerDebugConfig.DEBUG_SCREENSHOT is true

Change-Id: I3c51994471520043918b74ba3a056e73dcc9cd7d
This commit is contained in:
Jaewan Kim
2016-04-28 00:17:51 +00:00
committed by android-build-merger
parent 47eeeb56d9 cc3cb5a009
commit 58476341f3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -6290,9 +6290,11 @@ public class WindowManagerService extends IWindowManager.Stub
+ maxLayer + " appToken=" + appToken);
for (int i = 0; i < windows.size(); i++) {
WindowState win = windows.get(i);
WindowSurfaceController controller = win.mWinAnimator.mSurfaceController;
Slog.i(TAG_WM, win + ": " + win.mLayer
+ " animLayer=" + win.mWinAnimator.mAnimLayer
+ " surfaceLayer=" + win.mWinAnimator.mSurfaceController.getLayer());
+ " surfaceLayer=" + ((controller == null)
? "null" : controller.getLayer()));
}
}