diff options
| author | Raphael Moll <ralf@android.com> | 2010-04-27 17:30:04 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-04-27 17:30:04 -0700 |
| commit | 7a6aa0c2a2d2682b3c6b1b35267e1317a7e5a964 (patch) | |
| tree | c55e79c24d4c0590731cacb177902ca843a72f17 | |
| parent | b1abf9ed13963de9733782c8f28b03b2008832b9 (diff) | |
| parent | 967a86c958402216e978c54f3b9ee61ec2a12eb1 (diff) | |
| download | sdk-7a6aa0c2a2d2682b3c6b1b35267e1317a7e5a964.zip sdk-7a6aa0c2a2d2682b3c6b1b35267e1317a7e5a964.tar.gz sdk-7a6aa0c2a2d2682b3c6b1b35267e1317a7e5a964.tar.bz2 | |
Merge "Fix NPE in the DDMS plugin device view."
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/DeviceView.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/DeviceView.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/DeviceView.java index a13f3f2..fc6156d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/DeviceView.java +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/DeviceView.java @@ -246,9 +246,6 @@ public class DeviceView extends ViewPart implements IUiSelectionListener, IClien @Override public void createPartControl(Composite parent) { mParentShell = parent.getShell(); - ClientData.setHprofDumpHandler(new HProfHandler(mParentShell)); - AndroidDebugBridge.addClientChangeListener(this); - ClientData.setMethodProfilingHandler(new MethodProfilingHandler(mParentShell)); mDeviceList = new DevicePanel(DdmsPlugin.getImageLoader(), USE_SELECTED_DEBUG_PORT); mDeviceList.createPanel(parent); @@ -425,6 +422,10 @@ public class DeviceView extends ViewPart implements IUiSelectionListener, IClien } placeActions(); + + ClientData.setHprofDumpHandler(new HProfHandler(mParentShell)); + AndroidDebugBridge.addClientChangeListener(this); + ClientData.setMethodProfilingHandler(new MethodProfilingHandler(mParentShell)); } @Override |