Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add RingtoneManager.hasHapticChannels(Context, Uri)."

Browse Source
This commit is contained in:
Jiabin Huang
2022-01-26 06:46:12 +00:00
committed by Android (Google) Code Review
parent b476f8b522 0def6d1b51
commit 573de14b67
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -23217,6 +23217,7 @@ package android.media {
method public static android.net.Uri getValidRingtoneUri(android.content.Context);
method public boolean hasHapticChannels(int);
method public static boolean hasHapticChannels(@NonNull android.net.Uri);
method public static boolean hasHapticChannels(@NonNull android.content.Context, @NonNull android.net.Uri);
method public int inferStreamType();
method public static boolean isDefault(android.net.Uri);
method @Nullable public static android.content.res.AssetFileDescriptor openDefaultRingtoneUri(@NonNull android.content.Context, @NonNull android.net.Uri) throws java.io.FileNotFoundException;

14
media/java/android/media/RingtoneManager.java
View File

@@ -1059,7 +1059,8 @@ public class RingtoneManager {
* haptic channels or not. As this function doesn't has a context
* to resolve the uri, the result may be wrong if the uri cannot be
* resolved correctly.
* Use {@link #hasHapticChannels(int)} instead when possible.
* Use {@link #hasHapticChannels(int)} or {@link #hasHapticChannels(Context, Uri)}
* instead when possible.
*
* @param ringtoneUri The {@link Uri} of a sound or ringtone.
* @return true if the ringtone contains haptic channels.
@@ -1068,6 +1069,17 @@ public class RingtoneManager {
return AudioManager.hasHapticChannels(null, ringtoneUri);
}
/**
* Returns if the {@link Ringtone} from a given sound URI contains haptics channels or not.
*
* @param context the {@link android.content.Context} to use when resolving the Uri.
* @param ringtoneUri the {@link Uri} of a sound or ringtone.
* @return true if the ringtone contains haptic channels.
*/
public static boolean hasHapticChannels(@NonNull Context context, @NonNull Uri ringtoneUri) {
return AudioManager.hasHapticChannels(context, ringtoneUri);
}
/**
* Attempts to create a context for the given user.
*