diff options
| author | 2019-01-30 10:29:04 +0000 | |
|---|---|---|
| committer | 2019-01-30 10:29:04 +0000 | |
| commit | 8ffae36fa9a6f79f35dcef4be2233f2297d280da (patch) | |
| tree | 558c8fc1b89176a87fda93fe36cd4afbb22da637 | |
| parent | 5059dae031c878216a401a3d795a2f754f7374c7 (diff) | |
| parent | d750b856a37c84243b396ba6e53fb7a7d4a54c15 (diff) | |
Merge "Rename RollbackInfo.getSessionId to getCommittedSessionId."
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/rollback/RollbackInfo.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index e7c7b579b6d0..27f730075ab4 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1718,9 +1718,9 @@ package android.content.rollback { public final class RollbackInfo implements android.os.Parcelable { method public int describeContents(); method public java.util.List<android.content.pm.VersionedPackage> getCausePackages(); + method public int getCommittedSessionId(); 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 1111b4320eb9..3fd247670a9d 100644 --- a/core/java/android/content/rollback/RollbackInfo.java +++ b/core/java/android/content/rollback/RollbackInfo.java @@ -83,7 +83,7 @@ public final class RollbackInfo implements Parcelable { * Returns the session ID for the committed rollback for staged rollbacks. * Only applicable for rollbacks that have been committed. */ - public int getSessionId() { + public int getCommittedSessionId() { // TODO: Support rollback of staged installs. return PackageInstaller.SessionInfo.INVALID_ID; } |