diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-09-12 18:38:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-09-12 18:38:30 +0000 |
| commit | 82e4e60fbfc8c5422964d9f4e1dfa705c1ce6f4c (patch) | |
| tree | c58afcd2509770f2db8e8551dac9dc41a3b6bd15 /service | |
| parent | da4cb6aa6a6b95578a565316affddfed9043ec03 (diff) | |
| parent | b9e43730218a5c413be1ce73153016971ebec75d (diff) | |
Merge "WifiConfigManager: Handle user switch before store load"
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 558a1f3bb..40f487471 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -2555,7 +2555,11 @@ public class WifiConfigManager { return new HashSet<>(); } if (mPendingStoreRead) { - Log.wtf(TAG, "Unexpected user switch before store is read!"); + Log.w(TAG, "User switch before store is read!"); + mConfiguredNetworks.setNewUser(userId); + mCurrentUserId = userId; + // Cannot read data from new user's CE store file before they log-in. + mPendingUnlockStoreRead = true; return new HashSet<>(); } if (mUserManager.isUserUnlockingOrUnlocked(mCurrentUserId)) { |