Merge cherrypicks of ['googleplex-android-review.googlesource.com/24529771'] into tm-platform-release.android-platform-13.0.0_r19android13-platform-release

Change-Id: I5d5242119b1082f0d1765bec3aaeb141e5a8b804

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/tests/provider/src/android/provider/cts/settings/Settings_SystemTest.java b/tests/tests/provider/src/android/provider/cts/settings/Settings_SystemTest.java
index 9c603f8ede3..0de990eddf2 100644
--- a/tests/tests/provider/src/android/provider/cts/settings/Settings_SystemTest.java
+++ b/tests/tests/provider/src/android/provider/cts/settings/Settings_SystemTest.java
@@ -16,6 +16,8 @@
 
 package android.provider.cts.settings;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -181,6 +183,17 @@ public class Settings_SystemTest extends StsExtraBusinessLogicTestCase {
     }
 
     @Test
+    @AsbSecurityTest(cveBugId = 227201030)
+    public void testInvalidRingtoneUriIsRejected() {
+        final ContentResolver cr = InstrumentationRegistry.getTargetContext().getContentResolver();
+        final String originalValue = System.getString(cr, System.RINGTONE);
+        final String invalidUri = "content://10@media/external/audio/media/1000000019";
+        System.putString(cr, System.RINGTONE, invalidUri);
+        // Assert that the insertion didn't take effect
+        assertThat(System.getString(cr, System.RINGTONE)).isEqualTo(originalValue);
+    }
+
+    @Test
     public void testGetDefaultValues() {
         final ContentResolver cr = InstrumentationRegistry.getTargetContext().getContentResolver();