diff options
| author | Tianjie Xu <xunchang@google.com> | 2021-04-14 05:55:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-14 05:55:51 +0000 |
| commit | cd4836d197ab0cbf715b99f3a332e601bc3d8995 (patch) | |
| tree | 4e2b7cdf94798fd6f5893a7bb2c0265496d558c1 /core/java/android/os/RecoverySystem.java | |
| parent | b67a5b50fa5ac3dc60d1114ccbce00462b4aabba (diff) | |
| parent | 246c14d6daac279c7f24b08fe2917cb7c1f247c6 (diff) | |
Merge "Improve the error handling for armRebootEscrow" am: 246c14d6da
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649651
Change-Id: I5fc640360434adc032c2bc3691e9fd15eb5ea4b9
Diffstat (limited to 'core/java/android/os/RecoverySystem.java')
| -rw-r--r-- | core/java/android/os/RecoverySystem.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java index a42448c261d4..b474d7c95996 100644 --- a/core/java/android/os/RecoverySystem.java +++ b/core/java/android/os/RecoverySystem.java @@ -169,8 +169,9 @@ public class RecoverySystem { public @interface ResumeOnRebootRebootErrorCode {} /** - * The preparation of resume on reboot succeeds. Don't expose it because a successful reboot - * should just reboot the device. + * The preparation of resume on reboot succeeds. + * + * <p> Don't expose it because a successful reboot should just reboot the device. * @hide */ public static final int RESUME_ON_REBOOT_REBOOT_ERROR_NONE = 0; |