diff options
| author | Zhomart Mukhamejanov <zhomart@google.com> | 2018-06-01 01:12:34 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-01 01:12:34 +0200 |
| commit | 2759733136e4bfbbc5ca07a964141bcfbac9885a (patch) | |
| tree | 9c07e4b962f81e7a0f44edbfe812343397ffd3c9 | |
| parent | Merge "updater_sample: Improve update completion handling" (diff) | |
| parent | updater_sample: Add @GuardedBy (diff) | |
| download | android_bootable_recovery-2759733136e4bfbbc5ca07a964141bcfbac9885a.tar android_bootable_recovery-2759733136e4bfbbc5ca07a964141bcfbac9885a.tar.gz android_bootable_recovery-2759733136e4bfbbc5ca07a964141bcfbac9885a.tar.bz2 android_bootable_recovery-2759733136e4bfbbc5ca07a964141bcfbac9885a.tar.lz android_bootable_recovery-2759733136e4bfbbc5ca07a964141bcfbac9885a.tar.xz android_bootable_recovery-2759733136e4bfbbc5ca07a964141bcfbac9885a.tar.zst android_bootable_recovery-2759733136e4bfbbc5ca07a964141bcfbac9885a.zip | |
| -rw-r--r-- | updater_sample/Android.mk | 2 | ||||
| -rw-r--r-- | updater_sample/src/com/example/android/systemupdatersample/UpdateManager.java | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/updater_sample/Android.mk b/updater_sample/Android.mk index 056ad66be..7662111b7 100644 --- a/updater_sample/Android.mk +++ b/updater_sample/Android.mk @@ -18,8 +18,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := SystemUpdaterSample -LOCAL_SDK_VERSION := system_current LOCAL_MODULE_TAGS := samples +LOCAL_SDK_VERSION := system_current # TODO: enable proguard and use proguard.flags file LOCAL_PROGUARD_ENABLED := disabled diff --git a/updater_sample/src/com/example/android/systemupdatersample/UpdateManager.java b/updater_sample/src/com/example/android/systemupdatersample/UpdateManager.java index f5c2ea5ab..145cc83b1 100644 --- a/updater_sample/src/com/example/android/systemupdatersample/UpdateManager.java +++ b/updater_sample/src/com/example/android/systemupdatersample/UpdateManager.java @@ -39,6 +39,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.DoubleConsumer; import java.util.function.IntConsumer; +import javax.annotation.concurrent.GuardedBy; + /** * Manages the update flow. It has its own state (in memory), separate from * {@link UpdateEngine}'s state. Asynchronously interacts with the {@link UpdateEngine}. @@ -62,11 +64,16 @@ public class UpdateManager { private AtomicBoolean mManualSwitchSlotRequired = new AtomicBoolean(true); + @GuardedBy("mLock") private UpdateData mLastUpdateData = null; + @GuardedBy("mLock") private IntConsumer mOnStateChangeCallback = null; + @GuardedBy("mLock") private IntConsumer mOnEngineStatusUpdateCallback = null; + @GuardedBy("mLock") private DoubleConsumer mOnProgressUpdateCallback = null; + @GuardedBy("mLock") private IntConsumer mOnEngineCompleteCallback = null; private final Object mLock = new Object(); |