a256f19d3a
Symptom : Infinite reboot Reproduce step : 1. Set the Always-on VPN in M OS 2. OS upgrade from M to N Reproduce frequency : 100% Reason of issue : https://android.googlesource.com/platform/frameworks/base/+/9b74791 As you know, in M OS, Always-on VPN information is stored in keystore with encryted. However, in N OS, there is no encryption when it put in keystore. So, You deleted keystore check(locked/unlock) logic on ConnectivityService. By this reason, when device upgrade to N OS(set Always-on VPN), it goes infinite boot. (Cannot read old always-on vpn information untill device unlock.) Solution : I founded exception handling when this case as follows: If getting Credentials.LOCKDOWN_VPN information has null value(catch the exception), updateLockdownVpn returns false value. Signed-off-by: SangJin Cha <sj.cha@lge.com> Change-Id: I6fd980152440bb5248aab45e2f8fda448d3f6c7b