diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-20 12:59:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-08-20 12:59:20 +0000 |
| commit | 739663d450ef60333664867e3380bea67616512e (patch) | |
| tree | ce7d0f81f1af76e34ab05c4cc8779017cbb9065d /core/java | |
| parent | 9b936999118cf4d61f5fbc4b23ca3c9bbabe2bf8 (diff) | |
| parent | 4292708d0ed6b96d03e2ef781c8ec1ee74dc3eee (diff) | |
Merge "Replace redundant error code with a specific one"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/PackageInstaller.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index bed7b26034e5..b7c3289b6e66 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -2076,7 +2076,7 @@ public class PackageInstaller { STAGED_SESSION_VERIFICATION_FAILED, STAGED_SESSION_ACTIVATION_FAILED, STAGED_SESSION_UNKNOWN, - STAGED_SESSION_OTHER_ERROR}) + STAGED_SESSION_CONFLICT}) @Retention(RetentionPolicy.SOURCE) public @interface StagedSessionErrorCode{} /** @@ -2103,10 +2103,10 @@ public class PackageInstaller { public static final int STAGED_SESSION_UNKNOWN = 3; /** - * Constant indicating that a known error occurred while processing this staged session, but - * the error could not be matched to other categories. + * Constant indicating that the session was in conflict with another staged session and had + * to be sacrificed for resolution. */ - public static final int STAGED_SESSION_OTHER_ERROR = 4; + public static final int STAGED_SESSION_CONFLICT = 4; /** {@hide} */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) |