Merge "Don't reboot into recovery if block map file is missing." into nyc-dev (1b478f75) · Commits · e / os / android_frameworks_base

core/java/android/os/RecoverySystem.java

+27 −17

Original line number	Diff line number	Diff line
		@@ -434,14 +434,25 @@ public class RecoverySystem {
		String filename = packageFile.getCanonicalPath();
		Log.w(TAG, "!!! REBOOTING TO INSTALL " + filename + " !!!");

		if (!processed && filename.startsWith("/data/")) {
		// If the package is on the /data partition, the package needs to
		// be processed (i.e. uncrypt'd). The caller specifies if that has
		// been done in 'processed' parameter.
		if (filename.startsWith("/data/")) {
		if (processed) {
		if (!BLOCK_MAP_FILE.exists()) {
		Log.e(TAG, "Package claimed to have been processed but failed to find "
		+ "the block map file.");
		throw new IOException("Failed to find block map file");
		}
		} else {
		FileWriter uncryptFile = new FileWriter(UNCRYPT_PACKAGE_FILE);
		try {
		uncryptFile.write(filename + "\n");
		} finally {
		uncryptFile.close();
		}
		// UNCRYPT_PACKAGE_FILE needs to be readable and writable by system server.
		// UNCRYPT_PACKAGE_FILE needs to be readable and writable
		// by system server.
		if (!UNCRYPT_PACKAGE_FILE.setReadable(true, false)
		\|\| !UNCRYPT_PACKAGE_FILE.setWritable(true, false)) {
		Log.e(TAG, "Error setting permission for " + UNCRYPT_PACKAGE_FILE);
		@@ -450,9 +461,8 @@ public class RecoverySystem {
		BLOCK_MAP_FILE.delete();
		}

		// If the package is on the /data partition, use the block map file as
		// the package name instead.
		if (filename.startsWith("/data/")) {
		// If the package is on the /data partition, use the block map
		// file as the package name instead.
		filename = "@/cache/recovery/block.map";
		}