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

Commit 474b0f29 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 7686 into donut 

* changes:
  MediaScanner: Add check for null object in empty title handling code.
parents 54f09101 bdc0e82f

media/java/android/media/MediaScanner.java

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ public class MediaScanner 


            ContentValues values = toValues();

            String title = values.getAsString(MediaStore.MediaColumns.TITLE);

            if (TextUtils.isEmpty(title.trim())) {

            if (title == null || TextUtils.isEmpty(title.trim())) {

                title = values.getAsString(MediaStore.MediaColumns.DATA);

                // extract file name after last slash

                int lastSlash = title.lastIndexOf('/');