diff --git a/core/java/android/content/rollback/RollbackManager.java b/core/java/android/content/rollback/RollbackManager.java index fd0a1db79f1ff..9038b033c3c0d 100644 --- a/core/java/android/content/rollback/RollbackManager.java +++ b/core/java/android/content/rollback/RollbackManager.java @@ -16,6 +16,7 @@ package android.content.rollback; +import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SystemApi; @@ -27,6 +28,8 @@ import android.content.pm.ParceledListSlice; import android.content.pm.VersionedPackage; import android.os.RemoteException; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.util.List; /** @@ -112,6 +115,20 @@ public final class RollbackManager { public static final String EXTRA_STATUS_MESSAGE = "android.content.rollback.extra.STATUS_MESSAGE"; + /** + * Status result of committing a rollback. + * + * @hide + */ + @IntDef(prefix = "STATUS_", value = { + STATUS_SUCCESS, + STATUS_FAILURE, + STATUS_FAILURE_ROLLBACK_UNAVAILABLE, + STATUS_FAILURE_INSTALL, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface Status {}; + /** * The rollback was successfully committed. */ diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java index 871f9f8629458..952399bf3a7d1 100644 --- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java +++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java @@ -684,7 +684,8 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { * @param status the RollbackManager.STATUS_* code with the failure. * @param message the failure message. */ - private void sendFailure(IntentSender statusReceiver, int status, String message) { + private void sendFailure(IntentSender statusReceiver, @RollbackManager.Status int status, + String message) { Log.e(TAG, message); try { final Intent fillIn = new Intent();