From aa974cf42b0b6a69ec60727fe248a1d22be1fe14 Mon Sep 17 00:00:00 2001 From: Wilson Wu Date: Wed, 23 Oct 2024 01:56:28 +0000 Subject: Add null check in vibration util methods To avoid an exception when given ringtone uri is null, add null check in hasVibration method. Also add a check in getVibrationUri method to avoid any potential exception in the future. Flag: EXEMPT bugfix Fix: 374858125 Test: atest RingtoneManagerTest Test: atest RingtoneTest Test: atest RingerTest Change-Id: I51b28dcd349ac040273168aa6bac1427f20d7d95 --- media/java/android/media/Utils.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/media/java/android/media/Utils.java b/media/java/android/media/Utils.java index 41e9b65da93a..11bd221ec696 100644 --- a/media/java/android/media/Utils.java +++ b/media/java/android/media/Utils.java @@ -719,6 +719,9 @@ public class Utils { * @return {@code true} if the Uri has vibration parameter */ public static boolean hasVibration(Uri ringtoneUri) { + if (ringtoneUri == null) { + return false; + } final String vibrationUriString = ringtoneUri.getQueryParameter(VIBRATION_URI_PARAM); return vibrationUriString != null; } @@ -730,7 +733,10 @@ public class Utils { * @return parsed {@link Uri} of vibration parameter, {@code null} if the vibration parameter * is not found. */ - public static Uri getVibrationUri(Uri ringtoneUri) { + public static @Nullable Uri getVibrationUri(Uri ringtoneUri) { + if (ringtoneUri == null) { + return null; + } final String vibrationUriString = ringtoneUri.getQueryParameter(VIBRATION_URI_PARAM); if (vibrationUriString == null) { return null; -- cgit v1.2.3-59-g8ed1b