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

am 6be8dde6: am 4846a93b: Merge "Only call dump when a ViewRoot actually exists" into klp-dev

Browse Source 
* commit '6be8dde6f6447fe56af2a52554bba77ad0ee8d9c':
  Only call dump when a ViewRoot actually exists
This commit is contained in:
Michael Wright
2013-11-01 13:18:39 -07:00
committed by Android Git Automerger
parent 9730fbc0ea 6be8dde6f6
commit d35e94a3cb
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);
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);
}