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

am: 7519df9eaf Change-Id: Ic094b459a22a31a045ad61660694b616d7236893
2016-06-30 00:26:36 +00:00
parent f58f8f9d12 7519df9eaf
commit 961490e8ae
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/NativeDaemonConnectorException.java
+++ b/services/core/java/com/android/server/NativeDaemonConnectorException.java
@@ -41,7 +41,7 @@ public class NativeDaemonConnectorException extends Exception {
    }

    public int getCode() {
-        return mEvent.getCode();
+        return mEvent != null ? mEvent.getCode() : -1;
    }

    public String getCmd() {