Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1663400 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by Android Git Automerger
Browse files

am 39846e69: Merge change 7819 into donut 

Merge commit '39846e69'

* commit '39846e69':
  Fix NullPointer in VpnServiceBinder.checkStatus().
parents 9707ad12 39846e69

packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -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());