Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bump overlay version number." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-23 01:20:33 +00:00
committed by Android (Google) Code Review
parent dc28b0fdcb 5e1953a74e
commit daa0f4026a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/om/OverlayManagerSettings.java
View File

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