summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorYo Chiang <yochiang@google.com>2020-09-02 04:10:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-02 04:10:14 +0000
commit73d5afb2cbff521e348d8e87a6ceb50f9679ea0f (patch)
tree95d3d601f1c998a5b96bbbabfd64b1dea5eb6f55 /core/java/android
parenteae34dbebf7030985bf7a38e17a9768483f04691 (diff)
parentfbd85db85d55126ca952a046528d0b35d3cb9ad8 (diff)
Merge "Check error status after installing each DSU partition" am: fbd85db85d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404669 Change-Id: I1ebc08ebf05815ea17c8bbdca5cb745fa3aca40f
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/image/DynamicSystemManager.java13
-rw-r--r--core/java/android/os/image/IDynamicSystemService.aidl7
2 files changed, 20 insertions, 0 deletions
diff --git a/core/java/android/os/image/DynamicSystemManager.java b/core/java/android/os/image/DynamicSystemManager.java
index 17851adac51b..7f01cad940ec 100644
--- a/core/java/android/os/image/DynamicSystemManager.java
+++ b/core/java/android/os/image/DynamicSystemManager.java
@@ -155,6 +155,19 @@ public class DynamicSystemManager {
}
}
/**
+ * Complete the current partition installation.
+ *
+ * @return true if the partition installation completes without error.
+ */
+ @RequiresPermission(android.Manifest.permission.MANAGE_DYNAMIC_SYSTEM)
+ public boolean closePartition() {
+ try {
+ return mService.closePartition();
+ } catch (RemoteException e) {
+ throw new RuntimeException(e.toString());
+ }
+ }
+ /**
* Finish a previously started installation. Installations without a cooresponding
* finishInstallation() will be cleaned up during device boot.
*/
diff --git a/core/java/android/os/image/IDynamicSystemService.aidl b/core/java/android/os/image/IDynamicSystemService.aidl
index a1f927266de3..df0a69b47225 100644
--- a/core/java/android/os/image/IDynamicSystemService.aidl
+++ b/core/java/android/os/image/IDynamicSystemService.aidl
@@ -39,6 +39,13 @@ interface IDynamicSystemService
boolean createPartition(@utf8InCpp String name, long size, boolean readOnly);
/**
+ * Complete the current partition installation.
+ *
+ * @return true if the partition installation completes without error.
+ */
+ boolean closePartition();
+
+ /**
* Finish a previously started installation. Installations without
* a cooresponding finishInstallation() will be cleaned up during device boot.
*/