Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up the uncrypted OTA package on bootup."

Browse Source
This commit is contained in:
Tao Bao
2015-10-21 17:30:04 +00:00
committed by Gerrit Code Review
parent c2b9c5388a 87212ad6a8
commit 5d562d4d2f
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/android/os/RecoverySystem.java
View File

@@ -341,6 +341,10 @@ public class RecoverySystem {
} finally { } finally {
uncryptFile.close(); uncryptFile.close();
} }
// UNCRYPT_FILE needs to be readable by system server on bootup.
if (!UNCRYPT_FILE.setReadable(true, false)) {
Log.e(TAG, "Error setting readable for " + UNCRYPT_FILE.getCanonicalPath());
}
Log.w(TAG, "!!! REBOOTING TO INSTALL " + filename + " !!!"); Log.w(TAG, "!!! REBOOTING TO INSTALL " + filename + " !!!");
// If the package is on the /data partition, write the block map file // If the package is on the /data partition, write the block map file
@@ -501,6 +505,25 @@ public class RecoverySystem {
Log.e(TAG, "Error reading recovery log", e); Log.e(TAG, "Error reading recovery log", e);
} }
if (UNCRYPT_FILE.exists()) {
String filename = null;
try {
filename = FileUtils.readTextFile(UNCRYPT_FILE, 0, null);
} catch (IOException e) {
Log.e(TAG, "Error reading uncrypt file", e);
}
// Remove the OTA package on /data that has been (possibly
// partially) processed. (Bug: 24973532)
if (filename != null && filename.startsWith("/data")) {
if (UNCRYPT_FILE.delete()) {
Log.i(TAG, "Deleted: " + filename);
} else {
Log.e(TAG, "Can't delete: " + filename);
}
}
}
// Delete everything in RECOVERY_DIR except those beginning // Delete everything in RECOVERY_DIR except those beginning
// with LAST_PREFIX // with LAST_PREFIX
String[] names = RECOVERY_DIR.list(); String[] names = RECOVERY_DIR.list();