diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-17 20:09:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-17 20:09:43 -0700 |
| commit | 39846e691976fa7335bf5e648de46268d24b9927 (patch) | |
| tree | cc52803224a0b657fede3efa2eea1f2845c0ec15 /packages | |
| parent | 931b0a7ac83e33a29e32b691ae8818a2f41b7808 (diff) | |
| parent | 000c3ff943781e1535fd110e59bdca539c91ccf5 (diff) | |
| download | frameworks_base-39846e691976fa7335bf5e648de46268d24b9927.zip frameworks_base-39846e691976fa7335bf5e648de46268d24b9927.tar.gz frameworks_base-39846e691976fa7335bf5e648de46268d24b9927.tar.bz2 | |
Merge change 7819 into donut
* changes:
Fix NullPointer in VpnServiceBinder.checkStatus().
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java | 5 |
1 files 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()); |