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

Commit 5d97216d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Settings: keep the old ringtine cache not delete when set failed." into main

parents 7fe73e95 65b1a26d

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+5 −2
Original line number Diff line number Diff line
@@ -1993,8 +1993,6 @@ public class SettingsProvider extends ContentProvider { 
            if (!isValidMediaUri(name, value)) {

                return false;

            }

            // Invalidate any relevant cache files

            cacheFile.delete();

        }



        final boolean success;
@@ -2032,6 +2030,11 @@ public class SettingsProvider extends ContentProvider { 
            return false;

        }



        if (cacheFile != null) {

            // Invalidate any relevant cache files

            cacheFile.delete();

        }



        if ((operation == MUTATION_OPERATION_INSERT || operation == MUTATION_OPERATION_UPDATE)

                && cacheFile != null && value != null) {

            final Uri ringtoneUri = Uri.parse(value);