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

Commit aa974cf4 authored by Wilson Wu's avatar Wilson Wu
Browse files

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
parent 52b7229d

media/java/android/media/Utils.java

+7 −1
Original line number Diff line number Diff line
@@ -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;