tag edc6f4015d05aef546304d3927bbbf69426834b7
tagger The Android Open Source Project <initial-contribution@android.com> Tue Dec 02 16:50:58 2014 -0800
object 93edcc139722cc6c3f8dc3368846ae364d8ae82d

Android 5.0.1 release 1

commit 93edcc139722cc6c3f8dc3368846ae364d8ae82d
author Geoffrey Borggaard <geoffreyb@google.com> Thu Nov 20 14:35:32 2014 -0500
committer The Android Automerger <android-build@google.com> Thu Nov 20 15:32:44 2014 -0800
tree b0e29d2d5c74ef6c8315c178ed6c167ca7e3e941
parent 8de29d69d3df0e4bb1ead92493a5b3b20ade8f17

Fix null handling in proxies.

ProxyInfo.getPacFileUrl() can not be null.  It will be equal to
Uri.EMPTY.  Checking for null was causing global proxies to never be
disabled.  Or more accurately, global proxies would be disabled, but
would reappear after a reboot.

ProxyInfo.getExclusionListByString() can be null.  If no
exclusion list was specified, the proxy settings would not be
successfully saved, they would disappear after reboot.

Bug: 18453223
Change-Id: I1c27e5dca5b9664bb7468ea909bff489fa110a07