Handle SecurityExceptions while releasing file permissions

Bug: 33461345
Test: Manual test of RingtonePickerActivity

When custom ringtones are created, a persistable file permission to
read (play) the ringtone is taken. When the ringtone is deleted, the
permission is released. If the file was removed from the file system
prior to releasing the permission, a SecurityException occurs because
the permission in question is no longer held by the application. This
SecurityException is now handled gracefully.

Change-Id: Ia6fe9dbe2d1129bd6c081ae081da52fb7e61e334

1 files changed, 8 insertions, 2 deletions

diff --git a/src/com/android/deskclock/ringtone/RingtonePickerActivity.java b/src/com/android/deskclock/ringtone/RingtonePickerActivity.java
index 30b026fae..3fd5b95ea 100644
--- a/src/com/android/deskclock/ringtone/RingtonePickerActivity.java
+++ b/src/com/android/deskclock/ringtone/RingtonePickerActivity.java
@@ -603,8 +603,14 @@ public class RingtonePickerActivity extends BaseActivity
                 }
             }
 
-            // Release the permission to read (playback) the audio at the uri.
-            cr.releasePersistableUriPermission(mRemoveUri, FLAG_GRANT_READ_URI_PERMISSION);
+            try {
+                // Release the permission to read (playback) the audio at the uri.
+                cr.releasePersistableUriPermission(mRemoveUri, FLAG_GRANT_READ_URI_PERMISSION);
+            } catch (SecurityException ignore) {
+                // If the file was already deleted from the file system, a SecurityException is
+                // thrown indicating this app did not hold the read permission being released.
+                LogUtils.w("SecurityException while releasing read permission for " + mRemoveUri);
+            }
 
             return null;
         }