From: Ye Jiao <ye.jiao@mediatek.com>
Date: Fri, 29 Mar 2019 20:15:14 +0000 (-0700)
Subject: Merge "Fix getWifiManager exception if phone is encrypted"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=60d2beff2f45998ca3ecf6228ddf06f8d477f46c;p=android-x86%2Fframeworks-base.git

Merge "Fix getWifiManager exception if phone is encrypted"
am: 1f45f29d18

Change-Id: I47d47742083f38367fec31850db9d0e7fc9b3c13
---

60d2beff2f45998ca3ecf6228ddf06f8d477f46c