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

Commit 5e1953a7 authored by Andrew Sapperstein's avatar Andrew Sapperstein
Browse files

Bump overlay version number. 

Forces the overlays.xml file to be ignored and overwritten,
which makes the default overlay be used in all cases, rather
than no overlay.

Fixes: 37788042
Test: manual, removed some overlays in an update and observed that
the proper overlay was used.

Change-Id: Ieda4485f3e64ae627476e1fdcfc5af6cdcca0c15
parent 54ddf4a4

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");