summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recovery.cpp4
-rw-r--r--sample_updater/Android.mk2
-rw-r--r--sample_updater/AndroidManifest.xml18
-rw-r--r--sample_updater/res/layout/activity_main.xml20
-rw-r--r--sample_updater/src/com/android/update/ui/SystemUpdateActivity.java68
5 files changed, 106 insertions, 6 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 6bd291463..910cd8296 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1537,14 +1537,14 @@ int main(int argc, char **argv) {
// to log the update attempt since update_package is non-NULL.
modified_flash = true;
- if (!is_battery_ok()) {
+ if (retry_count == 0 && !is_battery_ok()) {
ui->Print("battery capacity is not enough for installing package, needed is %d%%\n",
BATTERY_OK_PERCENTAGE);
// Log the error code to last_install when installation skips due to
// low battery.
log_failure_code(kLowBattery, update_package);
status = INSTALL_SKIPPED;
- } else if (bootreason_in_blacklist()) {
+ } else if (retry_count == 0 && bootreason_in_blacklist()) {
// Skip update-on-reboot when bootreason is kernel_panic or similar
ui->Print("bootreason is in the blacklist; skip OTA installation\n");
log_failure_code(kBootreasonInBlacklist, update_package);
diff --git a/sample_updater/Android.mk b/sample_updater/Android.mk
index d6764bd01..2b0fcbeec 100644
--- a/sample_updater/Android.mk
+++ b/sample_updater/Android.mk
@@ -22,4 +22,6 @@ LOCAL_PACKAGE_NAME := SystemUpdateApp
LOCAL_SDK_VERSION := system_current
LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
include $(BUILD_PACKAGE)
diff --git a/sample_updater/AndroidManifest.xml b/sample_updater/AndroidManifest.xml
index ccee107bb..66414b5d3 100644
--- a/sample_updater/AndroidManifest.xml
+++ b/sample_updater/AndroidManifest.xml
@@ -14,8 +14,18 @@
limitations under the License.
-->
-<manifest
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="com.android.update">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.update">
+
+ <application android:label="Sample Updater">
+ <activity android:name=".ui.SystemUpdateActivity"
+ android:label="Sample Updater">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ </application>
+
</manifest>
+
diff --git a/sample_updater/res/layout/activity_main.xml b/sample_updater/res/layout/activity_main.xml
new file mode 100644
index 000000000..bd7d68677
--- /dev/null
+++ b/sample_updater/res/layout/activity_main.xml
@@ -0,0 +1,20 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+</LinearLayout>
diff --git a/sample_updater/src/com/android/update/ui/SystemUpdateActivity.java b/sample_updater/src/com/android/update/ui/SystemUpdateActivity.java
new file mode 100644
index 000000000..e57b1673c
--- /dev/null
+++ b/sample_updater/src/com/android/update/ui/SystemUpdateActivity.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.update.ui;
+
+import android.app.Activity;
+import android.os.UpdateEngine;
+import android.os.UpdateEngineCallback;
+
+/** Main update activity. */
+public class SystemUpdateActivity extends Activity {
+
+ private UpdateEngine updateEngine;
+ private UpdateEngineCallbackImpl updateEngineCallbackImpl = new UpdateEngineCallbackImpl(this);
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ updateEngine = new UpdateEngine();
+ updateEngine.bind(updateEngineCallbackImpl);
+ }
+
+ @Override
+ public void onPause() {
+ updateEngine.unbind();
+ super.onPause();
+ }
+
+ void onStatusUpdate(int i, float v) {
+ // Handle update engine status update
+ }
+
+ void onPayloadApplicationComplete(int i) {
+ // Handle apply payload completion
+ }
+
+ private static class UpdateEngineCallbackImpl extends UpdateEngineCallback {
+
+ private final SystemUpdateActivity activity;
+
+ public UpdateEngineCallbackImpl(SystemUpdateActivity activity) {
+ this.activity = activity;
+ }
+
+ @Override
+ public void onStatusUpdate(int i, float v) {
+ activity.onStatusUpdate(i, v);
+ }
+
+ @Override
+ public void onPayloadApplicationComplete(int i) {
+ activity.onPayloadApplicationComplete(i);
+ }
+ }
+}