Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a27fac6 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "PolicyVersionUpgrader: fix ERROR + stacktrace on first boot" into main... 

Merge "PolicyVersionUpgrader: fix ERROR + stacktrace on first boot" into main am: af5672fb am: 5a3c1bdc am: c9f6570d am: e0239039

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2700633



Change-Id: Ic7a1d65615528b89cb052c47950678055f9651e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bcfc3fb0 e0239039

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;