Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 961490e8 authored by Daniel 2 Olofsson's avatar Daniel 2 Olofsson Committed by android-build-merger
Browse files

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

am: 7519df9e

Change-Id: Ic094b459a22a31a045ad61660694b616d7236893
parents f58f8f9d 7519df9e

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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() {