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

Commit 71177b54 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3271477



Change-Id: Icf0c584215132f142e2e815cbadc526316060b7d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1aaff21 fd6f74d3

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

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

                return false;

            }

            // Invalidate any relevant cache files

            cacheFile.delete();

        }



        final boolean success;
@@ -2055,6 +2053,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);