Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 7819 into donut

Browse Source 
* changes:
  Fix NullPointer in VpnServiceBinder.checkStatus().
This commit is contained in:
Android (Google) Code Review
2009-07-17 20:09:43 -07:00
parent 931b0a7ac8 000c3ff943
commit 39846e6919
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java
View File

@@ -71,9 +71,8 @@ public class VpnServiceBinder extends Service {
} }
private synchronized void checkStatus(VpnProfile p) { private synchronized void checkStatus(VpnProfile p) {
if (mService == null) broadcastConnectivity(p.getName(), VpnState.IDLE); if ((mService == null)
|| (!p.getName().equals(mService.mProfile.getName()))) {
if (!p.getName().equals(mService.mProfile.getName())) {
broadcastConnectivity(p.getName(), VpnState.IDLE); broadcastConnectivity(p.getName(), VpnState.IDLE);
} else { } else {
broadcastConnectivity(p.getName(), mService.getState()); broadcastConnectivity(p.getName(), mService.getState());