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

Merge "Only call dump when a ViewRoot actually exists" into klp-dev

Browse Source
This commit is contained in:
Michael Wright
2013-11-01 20:11:48 +00:00
committed by Android (Google) Code Review
parent 17d28ca3d7 5f48dc7409
commit 4846a93b55
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/Activity.java
View File

@@ -4857,7 +4857,11 @@ public class Activity extends ContextThemeWrapper
mFragments.dump(prefix, fd, writer, args); mFragments.dump(prefix, fd, writer, args);
getWindow().getDecorView().getViewRootImpl().dump(prefix, fd, writer, args); if (getWindow() != null &&
getWindow().peekDecorView() != null &&
getWindow().peekDecorView().getViewRootImpl() != null) {
getWindow().peekDecorView().getViewRootImpl().dump(prefix, fd, writer, args);
}
mHandler.getLooper().dump(new PrintWriterPrinter(writer), prefix); mHandler.getLooper().dump(new PrintWriterPrinter(writer), prefix);
} }