From 469b35a4576a0398f62440383b520d091c90edb1 Mon Sep 17 00:00:00 2001 From: Zhomart Mukhamejanov Date: Fri, 1 Jun 2018 12:41:20 -0700 Subject: updater_sample: improve updater state handling - Enable more UpdaterState transitions. - MainActivity: Improve UI states. - UpdateManager: fix status handling errors, add suspend/resume methods. Add "synchronize this" to public control (suspend, cancel, ..) methods. - Add several UpdateManager tests. Test: on device Test: JUnit4 Change-Id: Id7f85dfaa466fa0d6136eee39e9fd7658278c616 Signed-off-by: Zhomart Mukhamejanov --- .../tests/res/raw/update_config_001_stream.json | 17 +++++++++ .../tests/res/raw/update_config_002_stream.json | 43 ++++++++++++++++++++++ .../tests/res/raw/update_config_003_nonstream.json | 9 +++++ .../tests/res/raw/update_config_stream_001.json | 17 --------- .../tests/res/raw/update_config_stream_002.json | 43 ---------------------- 5 files changed, 69 insertions(+), 60 deletions(-) create mode 100644 updater_sample/tests/res/raw/update_config_001_stream.json create mode 100644 updater_sample/tests/res/raw/update_config_002_stream.json create mode 100644 updater_sample/tests/res/raw/update_config_003_nonstream.json delete mode 100644 updater_sample/tests/res/raw/update_config_stream_001.json delete mode 100644 updater_sample/tests/res/raw/update_config_stream_002.json (limited to 'updater_sample/tests/res') diff --git a/updater_sample/tests/res/raw/update_config_001_stream.json b/updater_sample/tests/res/raw/update_config_001_stream.json new file mode 100644 index 000000000..be51b7c95 --- /dev/null +++ b/updater_sample/tests/res/raw/update_config_001_stream.json @@ -0,0 +1,17 @@ +{ + "name": "streaming-001", + "url": "http://foo.bar/update.zip", + "ab_install_type": "STREAMING", + "ab_streaming_metadata": { + "property_files": [ + { + "filename": "payload.bin", + "offset": 195, + "size": 8 + } + ] + }, + "ab_config": { + "force_switch_slot": true + } +} diff --git a/updater_sample/tests/res/raw/update_config_002_stream.json b/updater_sample/tests/res/raw/update_config_002_stream.json new file mode 100644 index 000000000..5d7874cdb --- /dev/null +++ b/updater_sample/tests/res/raw/update_config_002_stream.json @@ -0,0 +1,43 @@ +{ + "__": "*** Generated using tools/gen_update_config.py ***", + "ab_config": { + "force_switch_slot": false + }, + "ab_install_type": "STREAMING", + "ab_streaming_metadata": { + "property_files": [ + { + "filename": "payload_metadata.bin", + "offset": 41, + "size": 827 + }, + { + "filename": "payload.bin", + "offset": 41, + "size": 1392 + }, + { + "filename": "payload_properties.txt", + "offset": 1485, + "size": 147 + }, + { + "filename": "care_map.txt", + "offset": 1674, + "size": 12 + }, + { + "filename": "compatibility.zip", + "offset": 1733, + "size": 17 + }, + { + "filename": "metadata", + "offset": 1809, + "size": 29 + } + ] + }, + "name": "S ota_002_package", + "url": "file:///data/sample-ota-packages/ota_002_package.zip" +} \ No newline at end of file diff --git a/updater_sample/tests/res/raw/update_config_003_nonstream.json b/updater_sample/tests/res/raw/update_config_003_nonstream.json new file mode 100644 index 000000000..4175c35ea --- /dev/null +++ b/updater_sample/tests/res/raw/update_config_003_nonstream.json @@ -0,0 +1,9 @@ +{ + "__": "*** Generated using tools/gen_update_config.py ***", + "ab_config": { + "force_switch_slot": false + }, + "ab_install_type": "NON_STREAMING", + "name": "S ota_002_package", + "url": "file:///data/sample-ota-packages/ota_003_package.zip" +} \ No newline at end of file diff --git a/updater_sample/tests/res/raw/update_config_stream_001.json b/updater_sample/tests/res/raw/update_config_stream_001.json deleted file mode 100644 index be51b7c95..000000000 --- a/updater_sample/tests/res/raw/update_config_stream_001.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "streaming-001", - "url": "http://foo.bar/update.zip", - "ab_install_type": "STREAMING", - "ab_streaming_metadata": { - "property_files": [ - { - "filename": "payload.bin", - "offset": 195, - "size": 8 - } - ] - }, - "ab_config": { - "force_switch_slot": true - } -} diff --git a/updater_sample/tests/res/raw/update_config_stream_002.json b/updater_sample/tests/res/raw/update_config_stream_002.json deleted file mode 100644 index 5d7874cdb..000000000 --- a/updater_sample/tests/res/raw/update_config_stream_002.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "__": "*** Generated using tools/gen_update_config.py ***", - "ab_config": { - "force_switch_slot": false - }, - "ab_install_type": "STREAMING", - "ab_streaming_metadata": { - "property_files": [ - { - "filename": "payload_metadata.bin", - "offset": 41, - "size": 827 - }, - { - "filename": "payload.bin", - "offset": 41, - "size": 1392 - }, - { - "filename": "payload_properties.txt", - "offset": 1485, - "size": 147 - }, - { - "filename": "care_map.txt", - "offset": 1674, - "size": 12 - }, - { - "filename": "compatibility.zip", - "offset": 1733, - "size": 17 - }, - { - "filename": "metadata", - "offset": 1809, - "size": 29 - } - ] - }, - "name": "S ota_002_package", - "url": "file:///data/sample-ota-packages/ota_002_package.zip" -} \ No newline at end of file -- cgit v1.2.3