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

Commit c179e99e authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

Merge "Bump overlay version number." into oc-dev am: daa0f402 

am: ad8f7cb3

Change-Id: Idda6d2aa29e8dc07e18f937f4268136d0c60da19
parents 631f7b7e ad8f7cb3

services/core/java/com/android/server/om/OverlayManagerSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ final class OverlayManagerSettings { 
        private static final String ATTR_USER_ID = "userId";

        private static final String ATTR_VERSION = "version";



        private static final int CURRENT_VERSION = 2;

        private static final int CURRENT_VERSION = 3;



        public static void restore(@NonNull final ArrayList<SettingsItem> table,

                @NonNull final InputStream is) throws IOException, XmlPullParserException {
@@ -350,6 +350,7 @@ final class OverlayManagerSettings { 
            switch (oldVersion) {

                case 0:

                case 1:

                case 2:

                    // Throw an exception which will cause the overlay file to be ignored

                    // and overwritten.

                    throw new XmlPullParserException("old version " + oldVersion + "; ignoring");