summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-16 06:28:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-16 06:28:53 +0000
commit15e32bf1252dffa8699f681bd9f6b4aba3fe79fd (patch)
treefac1910d1184c65d47dd6fe814f3b1dcec023983 /core/java
parent4ec0be1fafd70ff43f5c579c73627b147168b194 (diff)
parentfeb7f9cf810c2e1e8cfdfdb19fb25e72a72614ee (diff)
Merge "Support multiple DSU installations" am: 69d181aecc am: fd9ae75440 am: feb7f9cf81
Change-Id: Iec8edb8568d707b827a8d4e70373333d96d6ab10
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/image/DynamicSystemManager.java4
-rw-r--r--core/java/android/os/image/IDynamicSystemService.aidl3
2 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/os/image/DynamicSystemManager.java b/core/java/android/os/image/DynamicSystemManager.java
index 4c92c28c1bfa..cbf531c5730a 100644
--- a/core/java/android/os/image/DynamicSystemManager.java
+++ b/core/java/android/os/image/DynamicSystemManager.java
@@ -106,9 +106,9 @@ public class DynamicSystemManager {
* @return true if the call succeeds
*/
@RequiresPermission(android.Manifest.permission.MANAGE_DYNAMIC_SYSTEM)
- public boolean startInstallation() {
+ public boolean startInstallation(String dsuSlot) {
try {
- return mService.startInstallation();
+ return mService.startInstallation(dsuSlot);
} catch (RemoteException e) {
throw new RuntimeException(e.toString());
}
diff --git a/core/java/android/os/image/IDynamicSystemService.aidl b/core/java/android/os/image/IDynamicSystemService.aidl
index 69cbab2c68ad..cc32f998d0c2 100644
--- a/core/java/android/os/image/IDynamicSystemService.aidl
+++ b/core/java/android/os/image/IDynamicSystemService.aidl
@@ -22,9 +22,10 @@ interface IDynamicSystemService
{
/**
* Start DynamicSystem installation.
+ * @param dsuSlot Name used to identify this installation
* @return true if the call succeeds
*/
- boolean startInstallation();
+ boolean startInstallation(@utf8InCpp String dsuSlot);
/**
* Create a DSU partition. This call may take 60~90 seconds. The caller