From e4e38d6631690d56520ca7469ebe08fdc33dc134 Mon Sep 17 00:00:00 2001
From: Richard Uhler <ruhler@google.com>
Date: Thu, 24 Jan 2019 16:12:07 +0000
Subject: [PATCH] Stub out API to support rollback of staged installs.

Adds isStaged and getSessionId methods to RollbackInfo.

Bug: 112431924
Test: atest RollbackTest
Change-Id: I23d3695021474d52cd39a90bcabdb278d95cd4cc
---
 api/system-current.txt                        |  2 ++
 .../content/rollback/RollbackInfo.java        | 22 ++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index f203dbb8c3bca..953955af3e953 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1700,6 +1700,8 @@ package android.content.rollback {
     method public int describeContents();
     method public java.util.List<android.content.rollback.PackageRollbackInfo> getPackages();
     method public int getRollbackId();
+    method public int getSessionId();
+    method public boolean isStaged();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator<android.content.rollback.RollbackInfo> CREATOR;
   }
diff --git a/core/java/android/content/rollback/RollbackInfo.java b/core/java/android/content/rollback/RollbackInfo.java
index 8532b5a4844e5..812f995675fce 100644
--- a/core/java/android/content/rollback/RollbackInfo.java
+++ b/core/java/android/content/rollback/RollbackInfo.java
@@ -17,6 +17,7 @@
 package android.content.rollback;
 
 import android.annotation.SystemApi;
+import android.content.pm.PackageInstaller;
 import android.os.Parcel;
 import android.os.Parcelable;
 
@@ -38,9 +39,6 @@ public final class RollbackInfo implements Parcelable {
 
     private final List<PackageRollbackInfo> mPackages;
 
-    // TODO: Add a flag to indicate if reboot is required, when rollback of
-    // staged installs is supported.
-
     /** @hide */
     public RollbackInfo(int rollbackId, List<PackageRollbackInfo> packages) {
         this.mRollbackId = rollbackId;
@@ -66,6 +64,24 @@ public final class RollbackInfo implements Parcelable {
         return mPackages;
     }
 
+    /**
+     * Returns true if this rollback requires reboot to take effect after
+     * being committed.
+     */
+    public boolean isStaged() {
+        // TODO: Support rollback of staged installs.
+        return false;
+    }
+
+    /**
+     * Returns the session ID for the committed rollback for staged rollbacks.
+     * Only applicable for rollbacks that have been committed.
+     */
+    public int getSessionId() {
+        // TODO: Support rollback of staged installs.
+        return PackageInstaller.SessionInfo.INVALID_ID;
+    }
+
     @Override
     public int describeContents() {
         return 0;