diff options
author | Xavier Ducrohet <xav@android.com> | 2011-02-01 15:39:21 -0800 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2011-02-01 15:39:21 -0800 |
commit | 56a10e4322385f3754322657b95a3eb7bf76bff8 (patch) | |
tree | e327ccfd08f9b5eb14b1a3cbb234e926f95a250a /traceview/src | |
parent | b3b9b2e84c62ed6e07b350b108ba4efc7175b5e1 (diff) | |
download | sdk-56a10e4322385f3754322657b95a3eb7bf76bff8.zip sdk-56a10e4322385f3754322657b95a3eb7bf76bff8.tar.gz sdk-56a10e4322385f3754322657b95a3eb7bf76bff8.tar.bz2 |
Fix possible NPE in Traceview.
Change-Id: I7834a4fee69ae103a5a39416aacea689e2010519
Diffstat (limited to 'traceview/src')
-rw-r--r-- | traceview/src/com/android/traceview/ProfileView.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/traceview/src/com/android/traceview/ProfileView.java b/traceview/src/com/android/traceview/ProfileView.java index e48cb56..71dedfd 100644 --- a/traceview/src/com/android/traceview/ProfileView.java +++ b/traceview/src/com/android/traceview/ProfileView.java @@ -49,7 +49,7 @@ import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.swt.widgets.TreeItem; public class ProfileView extends Composite implements Observer { - + private TreeViewer mTreeViewer; private Text mSearchBox; private SelectionController mSelectionController; @@ -199,7 +199,7 @@ public class ProfileView extends Composite implements Observer { } } }); - + // Add a tree listener so that we can expand the parents and children // of a method when a method is expanded. mTreeViewer.addTreeListener(new ITreeViewerListener() { @@ -300,9 +300,11 @@ public class ProfileView extends Composite implements Observer { ProfileNode[] nodes = md.getProfileNodes(); mTreeViewer.setExpandedState(md, true); // Also expand the "Parents" and "Children" nodes. - for (ProfileNode node : nodes) { - if (node.isRecursive() == false) - mTreeViewer.setExpandedState(node, true); + if (nodes != null) { + for (ProfileNode node : nodes) { + if (node.isRecursive() == false) + mTreeViewer.setExpandedState(node, true); + } } } } |