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

am 39846e69: Merge change 7819 into donut

Browse Source 
Merge commit '39846e691976fa7335bf5e648de46268d24b9927'

* commit '39846e691976fa7335bf5e648de46268d24b9927':
  Fix NullPointer in VpnServiceBinder.checkStatus().
This commit is contained in:
Android (Google) Code Review
2009-07-19 21:14:32 -07:00
committed by Android Git Automerger
parent 9707ad1257 39846e6919
commit a1663400f9
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) {
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());