diff options
author | Eric Schwarzenbach <easchwar@google.com> | 2018-01-31 15:05:14 -0800 |
---|---|---|
committer | Eric Schwarzenbach <easchwar@google.com> | 2018-02-05 09:25:48 -0800 |
commit | aa872c243eb5b27beaefe1360b69a46ceb016b56 (patch) | |
tree | 49dc8cbe1b44c477ebf69b5b4af37d2bdb75cc6e /service/java/com/android/server/wifi/WakeupConfigStoreData.java | |
parent | 4e16b8e38cbb98158e63ae88df211c33a1b07148 (diff) | |
download | android_frameworks_opt_net_wifi-aa872c243eb5b27beaefe1360b69a46ceb016b56.tar.gz android_frameworks_opt_net_wifi-aa872c243eb5b27beaefe1360b69a46ceb016b56.tar.bz2 android_frameworks_opt_net_wifi-aa872c243eb5b27beaefe1360b69a46ceb016b56.zip |
Fix WakeupConfigStoreData bug.
Prevents the wakeup controller from doing any work until the store has
been read.
Bug: 72757283
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: set user as onboarded, start phone with wifi disabled, ensure
that no onboarding notification pops up.
Test: wipe phone, reboot, turn wifi off, ensure onboarding notification
appears
Change-Id: I9968aa158ed2cd87c5f0f1ab04b4962404da0fb0
Diffstat (limited to 'service/java/com/android/server/wifi/WakeupConfigStoreData.java')
-rw-r--r-- | service/java/com/android/server/wifi/WakeupConfigStoreData.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WakeupConfigStoreData.java b/service/java/com/android/server/wifi/WakeupConfigStoreData.java index 0f33aae03..ae4cd808b 100644 --- a/service/java/com/android/server/wifi/WakeupConfigStoreData.java +++ b/service/java/com/android/server/wifi/WakeupConfigStoreData.java @@ -45,6 +45,7 @@ public class WakeupConfigStoreData implements StoreData { private final DataSource<Boolean> mIsActiveDataSource; private final DataSource<Boolean> mIsOnboardedDataSource; private final DataSource<Set<ScanResultMatchInfo>> mNetworkDataSource; + private boolean mHasBeenRead = false; /** * Interface defining a data source for the store data. @@ -80,6 +81,13 @@ public class WakeupConfigStoreData implements StoreData { mNetworkDataSource = networkDataSource; } + /** + * Returns whether the user store has been read. + */ + public boolean hasBeenRead() { + return mHasBeenRead; + } + @Override public void serializeData(XmlSerializer out, boolean shared) throws XmlPullParserException, IOException { @@ -132,6 +140,10 @@ public class WakeupConfigStoreData implements StoreData { @Override public void deserializeData(XmlPullParser in, int outerTagDepth, boolean shared) throws XmlPullParserException, IOException { + if (!shared) { + mHasBeenRead = true; + } + // Ignore empty reads. if (in == null) { return; |