Merge "PolicyVersionUpgrader: fix ERROR + stacktrace on first boot" into main... (e0239039) · Commits · e / os / android_frameworks_base

services/devicepolicy/java/com/android/server/devicepolicy/PolicyVersionUpgrader.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import java.io.File;
		import java.io.IOException;
		import java.nio.charset.Charset;
		import java.nio.file.Files;
		import java.nio.file.NoSuchFileException;
		import java.util.ArrayList;
		import java.util.List;

		@@ -307,6 +308,8 @@ public class PolicyVersionUpgrader {
		String versionString = Files.readAllLines(
		file.toPath(), Charset.defaultCharset()).get(0);
		return Integer.parseInt(versionString);
		} catch (NoSuchFileException e) {
		return 0; // expected on first boot
		} catch (IOException \| NumberFormatException \| IndexOutOfBoundsException e) {
		Slog.e(LOG_TAG, "Error reading version", e);
		return 0;