1 files changed, 8 insertions, 1 deletions

diff --git a/updater_sample/src/com/example/android/systemupdatersample/UpdateManager.java b/updater_sample/src/com/example/android/systemupdatersample/UpdateManager.java
index 145cc83b1..2fe04bdde 100644
--- a/updater_sample/src/com/example/android/systemupdatersample/UpdateManager.java
+++ b/updater_sample/src/com/example/android/systemupdatersample/UpdateManager.java
@@ -64,6 +64,9 @@ public class UpdateManager {
 
     private AtomicBoolean mManualSwitchSlotRequired = new AtomicBoolean(true);
 
+    /** Validate state only once when app binds to UpdateEngine. */
+    private AtomicBoolean mStateValidityEnsured = new AtomicBoolean(false);
+
     @GuardedBy("mLock")
     private UpdateData mLastUpdateData = null;
 
@@ -90,6 +93,7 @@ public class UpdateManager {
      * Binds to {@link UpdateEngine}.
      */
     public void bind() {
+        mStateValidityEnsured.set(false);
         this.mUpdateEngine.bind(mUpdateEngineCallback);
     }
 
@@ -468,7 +472,10 @@ public class UpdateManager {
         mUpdateEngineStatus.set(status);
         mProgress.set(progress);
 
-        ensureCorrectUpdaterState();
+        if (!mStateValidityEnsured.getAndSet(true)) {
+            // We ensure correct state once only when sample app is bound to UpdateEngine.
+            ensureCorrectUpdaterState();
+        }
 
         getOnProgressUpdateCallback().ifPresent(callback -> callback.accept(progress));