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

Commit a39fa441 authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am ac045858: am 684e6734: am 8a03fc04: am 99b33ccb: Merge "Fix crash in PacManager" into lmp-dev 

* commit 'ac045858d28a4b4066dcf4df35a18f415ed7a52c':
  Fix crash in PacManager
parents 8acb6abe abd0c4d6

services/core/java/com/android/server/connectivity/PacManager.java

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class PacManager { 
    public static final String KEY_PROXY = "keyProxy";

    private String mCurrentPac;

    @GuardedBy("mProxyLock")

    private Uri mPacUrl;

    private Uri mPacUrl = Uri.EMPTY;



    private AlarmManager mAlarmManager;

    @GuardedBy("mProxyLock")
@@ -175,7 +175,7 @@ public class PacManager { 
        } else {

            getAlarmManager().cancel(mPacRefreshIntent);

            synchronized (mProxyLock) {

                mPacUrl = null;

                mPacUrl = Uri.EMPTY;

                mCurrentPac = null;

                if (mProxyService != null) {

                    try {