OSDN Git Service

Fix null handling in proxies.
authorGeoffrey Borggaard <geoffreyb@google.com>
Thu, 20 Nov 2014 19:35:32 +0000 (14:35 -0500)
committerGeoffrey Borggaard <geoffreyb@google.com>
Thu, 20 Nov 2014 19:48:20 +0000 (19:48 +0000)
commit79adc958e5cd8daf7231ec042dfa367010d415f4
treeb06813d11359679a8fcc285e00d54632a9f470e4
parentc79173c7da4de4d809d3b5492e5433393193a652
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
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/net/IpConfigStore.java