From 878b45577a356e282576ccffa196da3a666d1e1c Mon Sep 17 00:00:00 2001
From: Daniel 2 Olofsson <daniel2.olofsson@sonymobile.com>
Date: Thu, 17 Jan 2013 12:05:34 +0100
Subject: [PATCH] Fix NativeDaemonConnectorException issue accessing null
 object

When function getCode is called on
NativeDaemonConnectorException object it may throw exception
due to mEvent object not being set for certain constructors.
Fix is to return a default error code as expected if mEvent
object has not been set rather than trying to call
mEvent.getCode().

Change-Id: Ia8aa23deb8871bb4df73096cc489b685a1765f16
---
 .../java/com/android/server/NativeDaemonConnectorException.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/NativeDaemonConnectorException.java b/services/core/java/com/android/server/NativeDaemonConnectorException.java
index 590bbccdbc5db..4d8881c68324e 100644
--- 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() {