commit 5d97216d548c94e88cf565a36aad791930af9ecf
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Sep 19 21:45:23 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 19 21:45:23 2024 +0000
tree 9874e26051eb68831329f73221cf1c0f19457a0b
parent 7fe73e957c8e685c5a77ff22bbf01ab67d2aebb8
parent 65b1a26d8c4584e1097aa208007f6d516444fd22

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

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

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 00a7826..f696036 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1993,8 +1993,6 @@
             if (!isValidMediaUri(name, value)) {
                 return false;
             }
-            // Invalidate any relevant cache files
-            cacheFile.delete();
         }
 
         final boolean success;
@@ -2032,6 +2030,11 @@
             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);