summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorHoward Chen <howardsoc@google.com>2020-01-15 22:01:38 -0800
committerandroid-build-merger <android-build-merger@google.com>2020-01-15 22:01:38 -0800
commitfd9ae75440ef835be4998d9e18511ff6a97a9102 (patch)
treec8487478484dd60788361d58abda97b6c34516f3 /core/java/android
parent2fd4a1c4be1ab6114c22694d15c9a767a1e447b1 (diff)
parent69d181aecc19305c1d64e44be282e7ed38b4a2d6 (diff)
Merge "Support multiple DSU installations"
am: 69d181aecc Change-Id: I92e75dcf4bd28f3b9ad6fc876f155d772b3124a5
Diffstat (limited to 'core/java/android')
-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