OSDN Git Service

Disable always-on VPN in factoryReset
authorKoichi, Sugimoto <koichi.x.sugimoto@sonymobile.com>
Wed, 27 Jan 2016 09:48:58 +0000 (18:48 +0900)
committerRobin Lee <rgl@google.com>
Wed, 18 Jan 2017 10:02:58 +0000 (10:02 +0000)
commitda1a7ac31aff8825ac790f3e219f757bc6349a99
treee0a65a3ecc5037ca4faeace4cc1e442f92d10834
parent7f9ed1cd85c54bc3416cfab3aa59cf3700ea3965
Disable always-on VPN in factoryReset

When network setting reset is started while always-on VPN is enabled,
application crash occurs with IllegalStateException in prepareVpn().

Therefore, it's necessary to also disable always-on VPN in factoryReset
before prepareVpn() when turning off VPN.

Bug: 29030858
Change-Id: I08c5406717dd7937d197c2e934a56d037477aafc
services/core/java/com/android/server/ConnectivityService.java