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

Commit 80e8db3d authored by Dmitry Polukhin's avatar Dmitry Polukhin Committed by Dmitry Polukhin
Browse files

[Backup] Special handling for sharedpref files in backup config 

Allow specifying sharedpref without .xml suffix as it is for
getSharedPreferences Android API. If .xml extension is missing for
sharedpref file name, it is added in include/exclude filters.

BUG: 20923818
Change-Id: I8bf3d43654b69d847e57c94f23aa3799e01948e6
parent 30c3c090

core/java/android/app/backup/FullBackup.java

+13 −1
Original line number Diff line number Diff line
@@ -401,7 +401,19 @@ public class FullBackup { 
                            activeSet.add(canonicalJournalPath);

                            if (Log.isLoggable(TAG_XML_PARSER, Log.VERBOSE)) {

                                Log.v(TAG_XML_PARSER, "...automatically generated "

                                        + canonicalJournalPath + ". Ignore if nonexistant.");

                                        + canonicalJournalPath + ". Ignore if nonexistent.");

                            }

                        }



                        // Special case for sharedpref files (not dirs) also add ".xml" suffix file.

                        if ("sharedpref".equals(domainFromXml) && !canonicalFile.isDirectory() &&

                            !canonicalFile.getCanonicalPath().endsWith(".xml")) {

                            final String canonicalXmlPath =

                                    canonicalFile.getCanonicalPath() + ".xml";

                            activeSet.add(canonicalXmlPath);

                            if (Log.isLoggable(TAG_XML_PARSER, Log.VERBOSE)) {

                                Log.v(TAG_XML_PARSER, "...automatically generated "

                                        + canonicalXmlPath + ". Ignore if nonexistent.");

                            }

                        }

                }

core/tests/coretests/src/android/app/backup/FullBackupTest.java

+30 −9
Original line number Diff line number Diff line
@@ -118,8 +118,10 @@ public class FullBackupTest extends AndroidTestCase { 
                        "<include path=\"include1.txt\" domain=\"file\"/>" +

                         "<exclude path=\"exclude2.txt\" domain=\"database\"/>" +

                        "<include path=\"include2.txt\" domain=\"database\"/>" +

                         "<exclude path=\"exclude3.txt\" domain=\"sharedpref\"/>" +

                        "<include path=\"include3.txt\" domain=\"sharedpref\"/>" +

                         "<exclude path=\"exclude3\" domain=\"sharedpref\"/>" +

                        "<include path=\"include3\" domain=\"sharedpref\"/>" +

                         "<exclude path=\"exclude4.xml\" domain=\"sharedpref\"/>" +

                        "<include path=\"include4.xml\" domain=\"sharedpref\"/>" +

                "</full-backup-content>"));
@@ -146,16 +148,27 @@ public class FullBackupTest extends AndroidTestCase { 
                                "include2.txt-journal")

                                .getCanonicalPath()));



        Set<String> sharedPrefDomainIncludes = includeMap.get(FullBackup.SHAREDPREFS_TREE_TOKEN);

        List<String> sharedPrefDomainIncludes = new ArrayList<String>(

                includeMap.get(FullBackup.SHAREDPREFS_TREE_TOKEN));

        Collections.sort(sharedPrefDomainIncludes);



        assertEquals("Didn't find expected sharedpref domain include.",

                1, sharedPrefDomainIncludes.size());

                3, sharedPrefDomainIncludes.size());

        assertEquals("Invalid path parsed for <include/>",

                new File(mContext.getSharedPrefsFile("foo").getParentFile(), "include3")

                        .getCanonicalPath(),

                sharedPrefDomainIncludes.get(0));

        assertEquals("Invalid path parsed for <include/>",

                new File(mContext.getSharedPrefsFile("foo").getParentFile(), "include3.xml")

                        .getCanonicalPath(),

                sharedPrefDomainIncludes.get(1));

        assertEquals("Invalid path parsed for <include/>",

                new File(mContext.getSharedPrefsFile("foo").getParentFile(), "include3.txt")

                new File(mContext.getSharedPrefsFile("foo").getParentFile(), "include4.xml")

                        .getCanonicalPath(),

                sharedPrefDomainIncludes.iterator().next());

                sharedPrefDomainIncludes.get(2));





        assertEquals("Unexpected number of <exclude/>s", 4, excludesSet.size());

        assertEquals("Unexpected number of <exclude/>s", 6, excludesSet.size());

        // Sets are annoying to iterate over b/c order isn't enforced - convert to an array and

        // sort lexicographically.

        List<String> arrayedSet = new ArrayList<String>(excludesSet);
@@ -173,9 +186,17 @@ public class FullBackupTest extends AndroidTestCase { 
                new File(mContext.getFilesDir(), "exclude1.txt").getCanonicalPath(),

                arrayedSet.get(2));

        assertEquals("Invalid path parsed for <exclude/>",

                new File(mContext.getSharedPrefsFile("foo").getParentFile(), "exclude3.txt")

                new File(mContext.getSharedPrefsFile("foo").getParentFile(), "exclude3")

                        .getCanonicalPath(),

                arrayedSet.get(3));

        assertEquals("Invalid path parsed for <exclude/>",

                new File(mContext.getSharedPrefsFile("foo").getParentFile(), "exclude3.xml")

                        .getCanonicalPath(),

                arrayedSet.get(4));

        assertEquals("Invalid path parsed for <exclude/>",

                new File(mContext.getSharedPrefsFile("foo").getParentFile(), "exclude4.xml")

                        .getCanonicalPath(),

                arrayedSet.get(5));

    }



    public void testParseBackupSchemeFromXml_invalidXmlFails() throws Exception {