Merge "Log the error when uncrypt timeouts" am: c1973ecbd2 am: c68e6d6708

am: 3aeade44a9 Change-Id: I913474dbf87b30683267d8f6a458927b7d331c4c
2016-09-28 20:05:15 +00:00
parent f3dba3b5f9 3aeade44a9
commit 96ce9d16ed
2 changed files with 16 additions and 0 deletions
--- a/core/java/android/os/RecoverySystem.java
+++ b/core/java/android/os/RecoverySystem.java
@@ -93,6 +93,14 @@ public class RecoverySystem {
     */
    public static final File UNCRYPT_PACKAGE_FILE = new File(RECOVERY_DIR, "uncrypt_file");

+    /**
+     * UNCRYPT_STATUS_FILE stores the time cost (and error code in the case of a failure)
+     * of uncrypt.
+     *
+     * @hide
+     */
+    public static final File UNCRYPT_STATUS_FILE = new File(RECOVERY_DIR, "uncrypt_status");
+
    // Length limits for reading files.
    private static final int LOG_FILE_MAX_LENGTH = 64 * 1024;