Merge "Fix NativeDaemonConnectorException issue accessing null object" into nyc-mr1-dev

This commit is contained in:
TreeHugger Robot
2016-06-30 00:20:50 +00:00
committed by Android (Google) Code Review

View File

@@ -41,7 +41,7 @@ public class NativeDaemonConnectorException extends Exception {
} }
public int getCode() { public int getCode() {
return mEvent.getCode(); return mEvent != null ? mEvent.getCode() : -1;
} }
public String getCmd() { public String getCmd() {