diff options
| author | 2014-09-19 19:25:46 +0000 | |
|---|---|---|
| committer | 2014-09-19 19:25:47 +0000 | |
| commit | f6edc55e6a2efdf14daf1b95cc9e3a9a6b4a213b (patch) | |
| tree | e4e487956dd34bcaf33c8dd533f7c391519274eb | |
| parent | 840855c021fe012fcf02b2704c8ca2dd4b092f2f (diff) | |
| parent | f6b46cb8b108cc8feee8ae68b979271fd6f72bf5 (diff) | |
Merge "Fix crash in PacManager" into lmp-dev
| -rw-r--r-- | services/core/java/com/android/server/connectivity/PacManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/connectivity/PacManager.java b/services/core/java/com/android/server/connectivity/PacManager.java index 63178eb0e06b..07fe7ba79582 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 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 { |