diff options
| author | Joey Grover <joeygrover@gmail.com> | 2017-02-07 10:09:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-07 10:09:09 -0500 |
| commit | 7c2af50734d148527e783bf8a8f432e1965ecbad (patch) | |
| tree | e4854cb070bdb7a15834767e50ac7a13c58449aa | |
| parent | 79b752b4d809b924c7c8df7f63ebf191db854709 (diff) | |
| parent | 8a5d77d09f9ce9ea720a9ebde48f356df9541bea (diff) | |
| download | sdl_android-7c2af50734d148527e783bf8a8f432e1965ecbad.tar.gz | |
Merge pull request #398 from smartdevicelink/bugfix/issue_379
Fix NPEs in SdlRouterService.processCheck()
| -rw-r--r-- | sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java b/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java index 608855631..7e270c295 100644 --- a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java +++ b/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java @@ -762,9 +762,11 @@ public class SdlRouterService extends Service{ private boolean processCheck(){ int myPid = android.os.Process.myPid(); ActivityManager am = (ActivityManager)this.getSystemService(ACTIVITY_SERVICE); + if(am == null || am.getRunningAppProcesses() == null) + return false; // No RunningAppProcesses, let's close out for (RunningAppProcessInfo processInfo : am.getRunningAppProcesses()) { - if (processInfo.pid == myPid) + if (processInfo != null && processInfo.pid == myPid) { return ROUTER_SERVICE_PROCESS.equals(processInfo.processName); } |