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

Commit 8998d084 authored by Song Chun Fan's avatar Song Chun Fan Committed by Automerger Merge Worker
Browse files

Merge "[SettingsProvider] clear binder identity when updating the ringtone... 

Merge "[SettingsProvider] clear binder identity when updating the ringtone cache" into udc-qpr-dev am: ed8ee277 am: bda550b7

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



Change-Id: I74a7c41426124dbd07520d8ee37827936ca21ea2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e425731 bda550b7

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

+8 −6
Original line number Diff line number Diff line
@@ -2054,12 +2054,14 @@ public class SettingsProvider extends ContentProvider { 
            final Uri ringtoneUri = Uri.parse(value);

            // Stream selected ringtone into cache, so it's available for playback

            // when CE storage is still locked

            Binder.withCleanCallingIdentity(() -> {

                try (InputStream in = openRingtone(getContext(), ringtoneUri);

                         OutputStream out = new FileOutputStream(cacheFile)) {

                    FileUtils.copy(in, out);

                } catch (IOException e) {

                    Slog.w(LOG_TAG, "Failed to cache ringtone: " + e);

                }

            });

        }

        return true;

    }