Merge \\"Fix NativeDaemonConnectorException issue accessing null object\\" into nyc-mr1-dev am: 6ba04e354e

am: 961490e8ae

Change-Id: I7f4be199eded99a3abc06321083a80f861f66ab9
This commit is contained in:
Daniel 2 Olofsson
2016-06-30 00:31:19 +00:00
committed by android-build-merger

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() {