commit 6ba04e354e56d17b4b930d1665f76100012ecc44
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 30 00:20:50 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 30 00:20:51 2016 +0000
tree 9f84b4b8acddce1082ba821c91a2e6f25f8eaa1b
parent e544a48eb24dcb1b6b8e4e85d00325c0eaf4b889
parent ab17d3a113b190aedf9282d4667cc39e130d3bd3

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

services/core/java/com/android/server/NativeDaemonConnectorException.java

diff --git a/services/core/java/com/android/server/NativeDaemonConnectorException.java b/services/core/java/com/android/server/NativeDaemonConnectorException.java
index 590bbcc..4d8881c 100644
--- a/services/core/java/com/android/server/NativeDaemonConnectorException.java
+++ b/services/core/java/com/android/server/NativeDaemonConnectorException.java
@@ -41,7 +41,7 @@
     }
 
     public int getCode() {
-        return mEvent.getCode();
+        return mEvent != null ? mEvent.getCode() : -1;
     }
 
     public String getCmd() {