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

am: 961490e8ae Change-Id: I7f4be199eded99a3abc06321083a80f861f66ab9
2016-06-30 00:31:19 +00:00
parent 3f28642bf1 6ba04e354e
commit 0b9f2f715f
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() {