From 000c3ff943781e1535fd110e59bdca539c91ccf5 Mon Sep 17 00:00:00 2001 From: Hung-ying Tyan Date: Sat, 18 Jul 2009 10:20:10 +0800 Subject: Fix NullPointer in VpnServiceBinder.checkStatus(). --- .../VpnServices/src/com/android/server/vpn/VpnServiceBinder.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java b/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java index cf153e3..7eb3287 100644 --- a/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java +++ b/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java @@ -71,9 +71,8 @@ public class VpnServiceBinder extends Service { } private synchronized void checkStatus(VpnProfile p) { - if (mService == null) broadcastConnectivity(p.getName(), VpnState.IDLE); - - if (!p.getName().equals(mService.mProfile.getName())) { + if ((mService == null) + || (!p.getName().equals(mService.mProfile.getName()))) { broadcastConnectivity(p.getName(), VpnState.IDLE); } else { broadcastConnectivity(p.getName(), mService.getState()); -- cgit v1.1