commit 417ea7d3d3310c3578887bd85d7e461176e844b0
author Jason Monk <jmonk@google.com> Fri Sep 19 19:40:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 19 19:40:43 2014 +0000
tree 5db4f781cdd4a56364423e40dc6a37296b092b89
parent 1e3d6bf3978b593275ea92b2350d6da4c0253612
parent 790068a1b1eed375279e647369b23287b994ca03

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

* commit '8a03fc048e335f4e372320161f3861d8eb97795f':
  Fix crash in PacManager

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

diff --git a/services/core/java/com/android/server/connectivity/PacManager.java b/services/core/java/com/android/server/connectivity/PacManager.java
index 63178eb..07fe7ba 100644
--- a/services/core/java/com/android/server/connectivity/PacManager.java
+++ b/services/core/java/com/android/server/connectivity/PacManager.java
@@ -71,7 +71,7 @@
     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 @@
         } else {
             getAlarmManager().cancel(mPacRefreshIntent);
             synchronized (mProxyLock) {
-                mPacUrl = null;
+                mPacUrl = Uri.EMPTY;
                 mCurrentPac = null;
                 if (mProxyService != null) {
                     try {