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

Commit 0d8fe14a authored by Dongwon Kang's avatar Dongwon Kang
Browse files

RingtoneManager: add @Nullable to openDefaultRingtoneUri(). 

Bug: 120072398
Test: make update-api
Change-Id: I9fd43ac80f643fe81b4ed16d84b4253f19899c1c
parent 01ce8981

media/java/android/media/RingtoneManager.java

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.media; 


import android.Manifest;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;
@@ -1029,7 +1030,7 @@ public class RingtoneManager { 
     * @throws FileNotFoundException if the provided URI could not be opened.

     * @see #getDefaultUri

     */

    public static AssetFileDescriptor openDefaultRingtoneUri(

    public static @Nullable AssetFileDescriptor openDefaultRingtoneUri(

            @NonNull Context context, @NonNull Uri uri) throws FileNotFoundException {

        // Try cached ringtone first since the actual provider may not be

        // encryption aware, or it may be stored on CE media storage